From 55db66563fd6db55e7d3b47fe22747ae487b7411 Mon Sep 17 00:00:00 2001 From: "github-action[bot]" Date: Tue, 28 May 2024 20:30:14 +0200 Subject: [PATCH] Update On Tue May 28 20:30:13 CEST 2024 --- .github/update.log | 1 + .../constant/features/version_windows.go | 2 +- clash-nyanpasu/frontend/nyanpasu/package.json | 7 +- .../frontend/nyanpasu/vite.config.ts | 12 +- clash-nyanpasu/package.json | 4 +- clash-nyanpasu/pnpm-lock.yaml | 254 +- clash-verge-rev/.babelrc | 7 + clash-verge-rev/package.json | 10 +- clash-verge-rev/pnpm-lock.yaml | 2751 +++++++++++++---- clash-verge-rev/vite.config.ts | 13 +- .../linux/ramips/dts/mt7621_openfi_5pro.dts | 153 + lede/target/linux/ramips/image/mt7621.mk | 9 + .../mt7621/base-files/etc/board.d/02_network | 1 + mihomo/constant/features/version_windows.go | 2 +- sing-box/docs/changelog.md | 4 +- .../docs/configuration/inbound/redirect.md | 2 +- sing-box/experimental/libbox/config.go | 9 + sing-box/experimental/libbox/platform.go | 7 + .../experimental/libbox/platform/interface.go | 8 + sing-box/experimental/libbox/service.go | 12 + sing-box/inbound/builder.go | 2 +- sing-box/inbound/redirect.go | 92 +- suyu/MIGRATION.md | 4 + v2rayu/Podfile.lock | 2 +- v2rayu/V2rayU.xcodeproj/project.pbxproj | 28 +- v2rayu/V2rayU/Ping.swift | 119 +- v2rayu/V2rayU/V2raySubscription.swift | 83 +- xray-core/Makefile | 2 +- yass/CMakeLists.txt | 414 ++- yt-dlp/CONTRIBUTORS | 1 + yt-dlp/Changelog.md | 11 + yt-dlp/README.md | 3 + yt-dlp/yt_dlp/extractor/peertube.py | 8 +- yt-dlp/yt_dlp/options.py | 3 +- yt-dlp/yt_dlp/version.py | 6 +- 35 files changed, 2944 insertions(+), 1102 deletions(-) create mode 100644 clash-verge-rev/.babelrc create mode 100755 lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts mode change 100644 => 100755 lede/target/linux/ramips/mt7621/base-files/etc/board.d/02_network diff --git a/.github/update.log b/.github/update.log index 08fb4c5014..b7d789709d 100644 --- a/.github/update.log +++ b/.github/update.log @@ -660,3 +660,4 @@ Update On Fri May 24 20:29:24 CEST 2024 Update On Sat May 25 20:28:13 CEST 2024 Update On Sun May 26 20:29:29 CEST 2024 Update On Mon May 27 20:31:35 CEST 2024 +Update On Tue May 28 20:30:03 CEST 2024 diff --git a/clash-meta/constant/features/version_windows.go b/clash-meta/constant/features/version_windows.go index 192df950fe..2f75618835 100644 --- a/clash-meta/constant/features/version_windows.go +++ b/clash-meta/constant/features/version_windows.go @@ -6,5 +6,5 @@ func init() { version := windows.RtlGetVersion() WindowsMajorVersion = version.MajorVersion WindowsMinorVersion = version.MinorVersion - WindowsBuildNumber = version.MinorVersion + WindowsBuildNumber = version.BuildNumber } diff --git a/clash-nyanpasu/frontend/nyanpasu/package.json b/clash-nyanpasu/frontend/nyanpasu/package.json index 6495c98f79..98932b9401 100644 --- a/clash-nyanpasu/frontend/nyanpasu/package.json +++ b/clash-nyanpasu/frontend/nyanpasu/package.json @@ -53,12 +53,11 @@ "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@types/react-transition-group": "4.4.10", - "@typescript-eslint/eslint-plugin": "7.10.0", - "@typescript-eslint/parser": "7.10.0", + "@typescript-eslint/eslint-plugin": "7.11.0", + "@typescript-eslint/parser": "7.11.0", "@vitejs/plugin-react": "4.3.0", - "babel-plugin-react-compiler": "0.0.0-experimental-592953e-20240517", "sass": "1.77.2", - "shiki": "1.6.0", + "shiki": "1.6.1", "vite": "5.2.11", "vite-plugin-monaco-editor": "1.1.3", "vite-plugin-sass-dts": "1.3.22", diff --git a/clash-nyanpasu/frontend/nyanpasu/vite.config.ts b/clash-nyanpasu/frontend/nyanpasu/vite.config.ts index 121b7a09e5..f6287a5460 100644 --- a/clash-nyanpasu/frontend/nyanpasu/vite.config.ts +++ b/clash-nyanpasu/frontend/nyanpasu/vite.config.ts @@ -48,17 +48,7 @@ export default defineConfig(({ command }) => { react({ // jsxImportSource: "@emotion/react", babel: { - plugins: [ - "@emotion/babel-plugin", - [ - "babel-plugin-react-compiler", - { - sources: (filename) => { - return filename.indexOf("src") !== -1; - }, - }, - ], - ], + plugins: ["@emotion/babel-plugin"], }, }), generouted(), diff --git a/clash-nyanpasu/package.json b/clash-nyanpasu/package.json index 905271fd5f..b5b1299248 100644 --- a/clash-nyanpasu/package.json +++ b/clash-nyanpasu/package.json @@ -87,8 +87,8 @@ "eslint-plugin-import": "2.29.1", "eslint-plugin-n": "16.6.2", "eslint-plugin-prettier": "5.1.3", - "eslint-plugin-promise": "6.1.1", - "eslint-plugin-react": "7.34.1", + "eslint-plugin-promise": "6.2.0", + "eslint-plugin-react": "7.34.2", "lint-staged": "15.2.5", "npm-run-all2": "6.2.0", "postcss": "8.4.38", diff --git a/clash-nyanpasu/pnpm-lock.yaml b/clash-nyanpasu/pnpm-lock.yaml index 22cdfa96a3..9bc3ae34f9 100644 --- a/clash-nyanpasu/pnpm-lock.yaml +++ b/clash-nyanpasu/pnpm-lock.yaml @@ -60,7 +60,7 @@ importers: version: 9.1.0(eslint@8.57.0) eslint-config-standard: specifier: 17.1.0 - version: 17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.1.1(eslint@8.57.0))(eslint@8.57.0) + version: 17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0) eslint-import-resolver-alias: specifier: 1.1.2 version: 1.1.2(eslint-plugin-import@2.29.1(eslint@8.57.0)) @@ -77,11 +77,11 @@ importers: specifier: 5.1.3 version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.2.5) eslint-plugin-promise: - specifier: 6.1.1 - version: 6.1.1(eslint@8.57.0) + specifier: 6.2.0 + version: 6.2.0(eslint@8.57.0) eslint-plugin-react: - specifier: 7.34.1 - version: 7.34.1(eslint@8.57.0) + specifier: 7.34.2 + version: 7.34.2(eslint@8.57.0) lint-staged: specifier: 15.2.5 version: 15.2.5 @@ -289,23 +289,20 @@ importers: specifier: 4.4.10 version: 4.4.10 '@typescript-eslint/eslint-plugin': - specifier: 7.10.0 - version: 7.10.0(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) + specifier: 7.11.0 + version: 7.11.0(@typescript-eslint/parser@7.11.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) '@typescript-eslint/parser': - specifier: 7.10.0 - version: 7.10.0(eslint@8.57.0)(typescript@5.4.5) + specifier: 7.11.0 + version: 7.11.0(eslint@8.57.0)(typescript@5.4.5) '@vitejs/plugin-react': specifier: 4.3.0 version: 4.3.0(vite@5.2.11(@types/node@20.12.12)(less@4.2.0)(sass@1.77.2)(stylus@0.62.0)) - babel-plugin-react-compiler: - specifier: 0.0.0-experimental-592953e-20240517 - version: 0.0.0-experimental-592953e-20240517 sass: specifier: 1.77.2 version: 1.77.2 shiki: - specifier: 1.6.0 - version: 1.6.0 + specifier: 1.6.1 + version: 1.6.1 vite: specifier: 5.2.11 version: 5.2.11(@types/node@20.12.12)(less@4.2.0)(sass@1.77.2)(stylus@0.62.0) @@ -433,9 +430,6 @@ packages: resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==} engines: {node: '>=6.9.0'} - '@babel/generator@7.2.0': - resolution: {integrity: sha512-BA75MVfRlFQG2EZgFYIwyT1r6xSkwfP2bdkY/kLZusEYWiJs4xCowab/alaEaT0wSvmVuXGqiefeBlP+7V1yKg==} - '@babel/generator@7.24.5': resolution: {integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==} engines: {node: '>=6.9.0'} @@ -1048,10 +1042,6 @@ packages: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} - '@jest/types@24.9.0': - resolution: {integrity: sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==} - engines: {node: '>= 6'} - '@jridgewell/gen-mapping@0.3.5': resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} engines: {node: '>=6.0.0'} @@ -1365,8 +1355,8 @@ packages: cpu: [x64] os: [win32] - '@shikijs/core@1.6.0': - resolution: {integrity: sha512-NIEAi5U5R7BLkbW1pG/ZKu3eb1lzc3/+jD0lFsuxMT7zjaf9bbNwdNyMr7zh/Zl8EXQtQ+MYBAt5G+JLu+5DlA==} + '@shikijs/core@1.6.1': + resolution: {integrity: sha512-CqYyepN4SnBopaoXYwng4NO8riB5ask/LTCkhOFq+GNGtr2X+aKeD767eYdqYukeixEUvv4bXdyTYVaogj7KBw==} '@sindresorhus/is@4.6.0': resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} @@ -1561,15 +1551,6 @@ packages: '@types/http-cache-semantics@4.0.4': resolution: {integrity: sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==} - '@types/istanbul-lib-coverage@2.0.6': - resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==} - - '@types/istanbul-lib-report@3.0.3': - resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==} - - '@types/istanbul-reports@1.1.2': - resolution: {integrity: sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==} - '@types/js-cookie@3.0.6': resolution: {integrity: sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ==} @@ -1627,17 +1608,11 @@ packages: '@types/unist@3.0.2': resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==} - '@types/yargs-parser@21.0.3': - resolution: {integrity: sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==} - - '@types/yargs@13.0.12': - resolution: {integrity: sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==} - '@types/yauzl@2.10.3': resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==} - '@typescript-eslint/eslint-plugin@7.10.0': - resolution: {integrity: sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==} + '@typescript-eslint/eslint-plugin@7.11.0': + resolution: {integrity: sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: '@typescript-eslint/parser': ^7.0.0 @@ -1647,8 +1622,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@7.10.0': - resolution: {integrity: sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==} + '@typescript-eslint/parser@7.11.0': + resolution: {integrity: sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -1657,12 +1632,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@7.10.0': - resolution: {integrity: sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==} + '@typescript-eslint/scope-manager@7.11.0': + resolution: {integrity: sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/type-utils@7.10.0': - resolution: {integrity: sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==} + '@typescript-eslint/type-utils@7.11.0': + resolution: {integrity: sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 @@ -1671,12 +1646,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@7.10.0': - resolution: {integrity: sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==} + '@typescript-eslint/types@7.11.0': + resolution: {integrity: sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==} engines: {node: ^18.18.0 || >=20.0.0} - '@typescript-eslint/typescript-estree@7.10.0': - resolution: {integrity: sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==} + '@typescript-eslint/typescript-estree@7.11.0': + resolution: {integrity: sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: typescript: '*' @@ -1684,14 +1659,14 @@ packages: typescript: optional: true - '@typescript-eslint/utils@7.10.0': - resolution: {integrity: sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==} + '@typescript-eslint/utils@7.11.0': + resolution: {integrity: sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==} engines: {node: ^18.18.0 || >=20.0.0} peerDependencies: eslint: ^8.56.0 - '@typescript-eslint/visitor-keys@7.10.0': - resolution: {integrity: sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==} + '@typescript-eslint/visitor-keys@7.11.0': + resolution: {integrity: sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==} engines: {node: ^18.18.0 || >=20.0.0} '@ungap/structured-clone@1.2.0': @@ -1754,10 +1729,6 @@ packages: resolution: {integrity: sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==} engines: {node: '>=4'} - ansi-regex@4.1.1: - resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==} - engines: {node: '>=6'} - ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -1860,9 +1831,6 @@ packages: resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==} engines: {node: '>=10', npm: '>=6'} - babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517: - resolution: {integrity: sha512-OjG1SVaeQZaJrqkMFJatg8W/MTow8Ak5rx2SI0ETQBO1XvOk/XZGMbltNCPdFJLKghBYoBjC+Y3Ap/Xr7B01mA==} - bail@2.0.2: resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==} @@ -2537,14 +2505,14 @@ packages: eslint-config-prettier: optional: true - eslint-plugin-promise@6.1.1: - resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} + eslint-plugin-promise@6.2.0: + resolution: {integrity: sha512-QmAqwizauvnKOlifxyDj2ObfULpHQawlg/zQdgEixur9vl0CvZGv/LCJV2rtj3210QCoeGBzVMfMXqGAOr/4fA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 - eslint-plugin-react@7.34.1: - resolution: {integrity: sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==} + eslint-plugin-react@7.34.2: + resolution: {integrity: sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==} engines: {node: '>=4'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 @@ -3026,9 +2994,6 @@ packages: intersection-observer@0.12.2: resolution: {integrity: sha512-7m1vEcPCxXYI8HqnL8CKI6siDyD+eIWSwgB3DZA+ZTogxk9I4CDnj4wilt9x/+/QbHI4YG5YZNmC6458/e9Ktg==} - invariant@2.2.4: - resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==} - ip-address@9.0.5: resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==} engines: {node: '>= 12'} @@ -4061,10 +4026,6 @@ packages: engines: {node: '>=14'} hasBin: true - pretty-format@24.9.0: - resolution: {integrity: sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==} - engines: {node: '>= 6'} - progress@2.0.3: resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} engines: {node: '>=0.4.0'} @@ -4396,8 +4357,8 @@ packages: shell-quote@1.8.1: resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} - shiki@1.6.0: - resolution: {integrity: sha512-P31ROeXcVgW/k3Z+vUUErcxoTah7ZRaimctOpzGuqAntqnnSmx1HOsvnbAB8Z2qfXPRhw61yptAzCsuKOhTHwQ==} + shiki@1.6.1: + resolution: {integrity: sha512-1Pu/A1rtsG6HZvQm4W0NExQ45e02og+rPog7PDaFDiMumZgOYnZIu4JtGQeAIfMwdbKSjJQoCUr79vDLKUUxWA==} side-channel@1.0.6: resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} @@ -4683,10 +4644,6 @@ packages: trim-lines@3.0.1: resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} - trim-right@1.0.1: - resolution: {integrity: sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==} - engines: {node: '>=0.10.0'} - trough@2.2.0: resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==} @@ -5082,15 +5039,6 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} - zod-validation-error@2.1.0: - resolution: {integrity: sha512-VJh93e2wb4c3tWtGgTa0OF/dTt/zoPCPzXq4V11ZjxmEAFaPi/Zss1xIZdEB5RD8GD00U0/iVXgqkF77RV7pdQ==} - engines: {node: '>=18.0.0'} - peerDependencies: - zod: ^3.18.0 - - zod@3.23.8: - resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==} - zwitch@2.0.4: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==} @@ -5144,14 +5092,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/generator@7.2.0': - dependencies: - '@babel/types': 7.24.5 - jsesc: 2.5.2 - lodash: 4.17.21 - source-map: 0.5.7 - trim-right: 1.0.1 - '@babel/generator@7.24.5': dependencies: '@babel/types': 7.24.5 @@ -5724,12 +5664,6 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 - '@jest/types@24.9.0': - dependencies: - '@types/istanbul-lib-coverage': 2.0.6 - '@types/istanbul-reports': 1.1.2 - '@types/yargs': 13.0.12 - '@jridgewell/gen-mapping@0.3.5': dependencies: '@jridgewell/set-array': 1.2.1 @@ -6014,7 +5948,7 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.17.2': optional: true - '@shikijs/core@1.6.0': {} + '@shikijs/core@1.6.1': {} '@sindresorhus/is@4.6.0': {} @@ -6202,17 +6136,6 @@ snapshots: '@types/http-cache-semantics@4.0.4': {} - '@types/istanbul-lib-coverage@2.0.6': {} - - '@types/istanbul-lib-report@3.0.3': - dependencies: - '@types/istanbul-lib-coverage': 2.0.6 - - '@types/istanbul-reports@1.1.2': - dependencies: - '@types/istanbul-lib-coverage': 2.0.6 - '@types/istanbul-lib-report': 3.0.3 - '@types/js-cookie@3.0.6': {} '@types/json5@0.0.29': {} @@ -6271,25 +6194,19 @@ snapshots: '@types/unist@3.0.2': {} - '@types/yargs-parser@21.0.3': {} - - '@types/yargs@13.0.12': - dependencies: - '@types/yargs-parser': 21.0.3 - '@types/yauzl@2.10.3': dependencies: '@types/node': 20.12.12 optional: true - '@typescript-eslint/eslint-plugin@7.10.0(@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/eslint-plugin@7.11.0(@typescript-eslint/parser@7.11.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 7.10.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/scope-manager': 7.10.0 - '@typescript-eslint/type-utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.10.0 + '@typescript-eslint/parser': 7.11.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.11.0 + '@typescript-eslint/type-utils': 7.11.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.11.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.11.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 @@ -6300,12 +6217,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.10.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/parser@7.11.0(eslint@8.57.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/scope-manager': 7.10.0 - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 7.10.0 + '@typescript-eslint/scope-manager': 7.11.0 + '@typescript-eslint/types': 7.11.0 + '@typescript-eslint/typescript-estree': 7.11.0(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.11.0 debug: 4.3.4 eslint: 8.57.0 optionalDependencies: @@ -6313,15 +6230,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@7.10.0': + '@typescript-eslint/scope-manager@7.11.0': dependencies: - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/visitor-keys': 7.10.0 + '@typescript-eslint/types': 7.11.0 + '@typescript-eslint/visitor-keys': 7.11.0 - '@typescript-eslint/type-utils@7.10.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/type-utils@7.11.0(eslint@8.57.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5) - '@typescript-eslint/utils': 7.10.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 7.11.0(typescript@5.4.5) + '@typescript-eslint/utils': 7.11.0(eslint@8.57.0)(typescript@5.4.5) debug: 4.3.4 eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.4.5) @@ -6330,12 +6247,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/types@7.10.0': {} + '@typescript-eslint/types@7.11.0': {} - '@typescript-eslint/typescript-estree@7.10.0(typescript@5.4.5)': + '@typescript-eslint/typescript-estree@7.11.0(typescript@5.4.5)': dependencies: - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/visitor-keys': 7.10.0 + '@typescript-eslint/types': 7.11.0 + '@typescript-eslint/visitor-keys': 7.11.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -6347,20 +6264,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@7.10.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/utils@7.11.0(eslint@8.57.0)(typescript@5.4.5)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) - '@typescript-eslint/scope-manager': 7.10.0 - '@typescript-eslint/types': 7.10.0 - '@typescript-eslint/typescript-estree': 7.10.0(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.11.0 + '@typescript-eslint/types': 7.11.0 + '@typescript-eslint/typescript-estree': 7.11.0(typescript@5.4.5) eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@7.10.0': + '@typescript-eslint/visitor-keys@7.11.0': dependencies: - '@typescript-eslint/types': 7.10.0 + '@typescript-eslint/types': 7.11.0 eslint-visitor-keys: 3.4.3 '@ungap/structured-clone@1.2.0': {} @@ -6441,8 +6358,6 @@ snapshots: ansi-regex@3.0.1: {} - ansi-regex@4.1.1: {} - ansi-regex@5.0.1: {} ansi-regex@6.0.1: {} @@ -6580,16 +6495,6 @@ snapshots: cosmiconfig: 7.1.0 resolve: 1.22.8 - babel-plugin-react-compiler@0.0.0-experimental-592953e-20240517: - dependencies: - '@babel/generator': 7.2.0 - '@babel/types': 7.24.5 - chalk: 4.1.2 - invariant: 2.2.4 - pretty-format: 24.9.0 - zod: 3.23.8 - zod-validation-error: 2.1.0(zod@3.23.8) - bail@2.0.2: {} balanced-match@1.0.2: {} @@ -7268,12 +7173,12 @@ snapshots: dependencies: eslint: 8.57.0 - eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.1.1(eslint@8.57.0))(eslint@8.57.0): + eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint-plugin-n@16.6.2(eslint@8.57.0))(eslint-plugin-promise@6.2.0(eslint@8.57.0))(eslint@8.57.0): dependencies: eslint: 8.57.0 eslint-plugin-import: 2.29.1(eslint@8.57.0) eslint-plugin-n: 16.6.2(eslint@8.57.0) - eslint-plugin-promise: 6.1.1(eslint@8.57.0) + eslint-plugin-promise: 6.2.0(eslint@8.57.0) eslint-import-resolver-alias@1.1.2(eslint-plugin-import@2.29.1(eslint@8.57.0)): dependencies: @@ -7356,11 +7261,11 @@ snapshots: optionalDependencies: eslint-config-prettier: 9.1.0(eslint@8.57.0) - eslint-plugin-promise@6.1.1(eslint@8.57.0): + eslint-plugin-promise@6.2.0(eslint@8.57.0): dependencies: eslint: 8.57.0 - eslint-plugin-react@7.34.1(eslint@8.57.0): + eslint-plugin-react@7.34.2(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlast: 1.2.5 @@ -7952,10 +7857,6 @@ snapshots: intersection-observer@0.12.2: {} - invariant@2.2.4: - dependencies: - loose-envify: 1.4.0 - ip-address@9.0.5: dependencies: jsbn: 1.1.0 @@ -9007,13 +8908,6 @@ snapshots: prettier@3.2.5: {} - pretty-format@24.9.0: - dependencies: - '@jest/types': 24.9.0 - ansi-regex: 4.1.1 - ansi-styles: 3.2.1 - react-is: 16.13.1 - progress@2.0.3: {} prop-types@15.8.1: @@ -9380,9 +9274,9 @@ snapshots: shell-quote@1.8.1: {} - shiki@1.6.0: + shiki@1.6.1: dependencies: - '@shikijs/core': 1.6.0 + '@shikijs/core': 1.6.1 side-channel@1.0.6: dependencies: @@ -9760,8 +9654,6 @@ snapshots: trim-lines@3.0.1: {} - trim-right@1.0.1: {} - trough@2.2.0: {} ts-api-utils@1.3.0(typescript@5.4.5): @@ -10197,10 +10089,4 @@ snapshots: yocto-queue@1.0.0: {} - zod-validation-error@2.1.0(zod@3.23.8): - dependencies: - zod: 3.23.8 - - zod@3.23.8: {} - zwitch@2.0.4: {} diff --git a/clash-verge-rev/.babelrc b/clash-verge-rev/.babelrc new file mode 100644 index 0000000000..202d425a09 --- /dev/null +++ b/clash-verge-rev/.babelrc @@ -0,0 +1,7 @@ +{ + "presets": [ + "@babel/preset-env", + "@babel/preset-react", + "@babel/preset-typescript" + ] +} diff --git a/clash-verge-rev/package.json b/clash-verge-rev/package.json index 58ca421d60..7d8680ddc4 100644 --- a/clash-verge-rev/package.json +++ b/clash-verge-rev/package.json @@ -38,7 +38,6 @@ "meta-json-schema": "1.18.5-alpha", "monaco-editor": "^0.47.0", "monaco-yaml": "^5.1.1", - "types-pac": "^1.0.2", "nanoid": "^5.0.7", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -51,10 +50,15 @@ "react-virtuoso": "^4.7.10", "recoil": "^0.7.7", "swr": "^1.3.0", - "tar": "^6.2.1" + "tar": "^6.2.1", + "types-pac": "^1.0.2" }, "devDependencies": { "@actions/github": "^5.1.1", + "@babel/preset-env": "^7.24.6", + "@babel/preset-react": "^7.24.6", + "@babel/preset-typescript": "^7.24.6", + "@rollup/plugin-babel": "^6.0.4", "@tauri-apps/cli": "^1.5.13", "@types/fs-extra": "^9.0.13", "@types/js-cookie": "^3.0.6", @@ -62,7 +66,7 @@ "@types/react": "^18.3.1", "@types/react-dom": "^18.3.0", "@types/react-transition-group": "^4.4.10", - "@vitejs/plugin-react": "^4.2.1", + "@vitejs/plugin-react": "^4.3.0", "adm-zip": "^0.5.12", "cross-env": "^7.0.3", "fs-extra": "^11.2.0", diff --git a/clash-verge-rev/pnpm-lock.yaml b/clash-verge-rev/pnpm-lock.yaml index 9ba4de7d04..c69ea52405 100644 --- a/clash-verge-rev/pnpm-lock.yaml +++ b/clash-verge-rev/pnpm-lock.yaml @@ -18,43 +18,43 @@ importers: version: 3.2.2(react@18.3.1) "@emotion/react": specifier: ^11.11.4 - version: 11.11.4(@types/react@18.3.1)(react@18.3.1) + version: 11.11.4(@types/react@18.3.3)(react@18.3.1) "@emotion/styled": specifier: ^11.11.5 - version: 11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) + version: 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) "@juggle/resize-observer": specifier: ^3.4.0 version: 3.4.0 "@mui/icons-material": specifier: ^5.15.16 - version: 5.15.16(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) + version: 5.15.18(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) "@mui/lab": specifier: 5.0.0-alpha.149 - version: 5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) "@mui/material": specifier: ^5.15.16 - version: 5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) "@mui/x-data-grid": specifier: ^6.19.11 - version: 6.19.11(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.20.0(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) "@tauri-apps/api": specifier: ^1.5.4 - version: 1.5.4 + version: 1.5.6 "@types/json-schema": specifier: ^7.0.15 version: 7.0.15 ahooks: specifier: ^3.7.11 - version: 3.7.11(react@18.3.1) + version: 3.8.0(react@18.3.1) axios: specifier: ^1.6.8 - version: 1.6.8 + version: 1.7.2 dayjs: specifier: 1.11.5 version: 1.11.5 i18next: specifier: ^23.11.3 - version: 23.11.3 + version: 23.11.5 lodash-es: specifier: ^4.17.21 version: 4.17.21 @@ -81,22 +81,22 @@ importers: version: 3.1.4(react@18.3.1) react-hook-form: specifier: ^7.51.4 - version: 7.51.4(react@18.3.1) + version: 7.51.5(react@18.3.1) react-i18next: specifier: ^13.5.0 - version: 13.5.0(i18next@23.11.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 13.5.0(i18next@23.11.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-markdown: specifier: ^9.0.1 - version: 9.0.1(@types/react@18.3.1)(react@18.3.1) + version: 9.0.1(@types/react@18.3.3)(react@18.3.1) react-router-dom: specifier: ^6.23.0 - version: 6.23.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-transition-group: specifier: ^4.4.5 version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-virtuoso: specifier: ^4.7.10 - version: 4.7.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 4.7.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1) recoil: specifier: ^0.7.7 version: 0.7.7(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -113,9 +113,21 @@ importers: "@actions/github": specifier: ^5.1.1 version: 5.1.1 + "@babel/preset-env": + specifier: ^7.24.6 + version: 7.24.6(@babel/core@7.24.6) + "@babel/preset-react": + specifier: ^7.24.6 + version: 7.24.6(@babel/core@7.24.6) + "@babel/preset-typescript": + specifier: ^7.24.6 + version: 7.24.6(@babel/core@7.24.6) + "@rollup/plugin-babel": + specifier: ^6.0.4 + version: 6.0.4(@babel/core@7.24.6)(@types/babel__core@7.20.5)(rollup@4.18.0) "@tauri-apps/cli": specifier: ^1.5.13 - version: 1.5.13 + version: 1.5.14 "@types/fs-extra": specifier: ^9.0.13 version: 9.0.13 @@ -127,7 +139,7 @@ importers: version: 4.17.12 "@types/react": specifier: ^18.3.1 - version: 18.3.1 + version: 18.3.3 "@types/react-dom": specifier: ^18.3.0 version: 18.3.0 @@ -135,8 +147,8 @@ importers: specifier: ^4.4.10 version: 4.4.10 "@vitejs/plugin-react": - specifier: ^4.2.1 - version: 4.2.1(vite@5.2.11(@types/node@20.12.10)(sass@1.77.0)) + specifier: ^4.3.0 + version: 4.3.0(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)) adm-zip: specifier: ^0.5.12 version: 0.5.12 @@ -163,19 +175,19 @@ importers: version: 3.3.1(prettier@2.8.8) sass: specifier: ^1.77.0 - version: 1.77.0 + version: 1.77.2 typescript: specifier: ^5.4.5 version: 5.4.5 vite: specifier: ^5.2.11 - version: 5.2.11(@types/node@20.12.10)(sass@1.77.0) + version: 5.2.11(@types/node@20.12.12)(sass@1.77.2) vite-plugin-monaco-editor: specifier: ^1.1.0 version: 1.1.0(monaco-editor@0.47.0) vite-plugin-svgr: specifier: ^4.2.0 - version: 4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.2.11(@types/node@20.12.10)(sass@1.77.0)) + version: 4.2.0(rollup@4.18.0)(typescript@5.4.5)(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)) packages: "@actions/github@5.1.1": @@ -197,185 +209,1002 @@ packages: } engines: { node: ">=6.0.0" } - "@babel/code-frame@7.24.2": + "@babel/code-frame@7.24.6": resolution: { - integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==, + integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==, } engines: { node: ">=6.9.0" } - "@babel/compat-data@7.24.4": + "@babel/compat-data@7.24.6": resolution: { - integrity: sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==, + integrity: sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==, } engines: { node: ">=6.9.0" } - "@babel/core@7.24.5": + "@babel/core@7.24.6": resolution: { - integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==, + integrity: sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==, } engines: { node: ">=6.9.0" } - "@babel/generator@7.24.5": + "@babel/generator@7.24.6": resolution: { - integrity: sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==, + integrity: sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==, } engines: { node: ">=6.9.0" } - "@babel/helper-compilation-targets@7.23.6": + "@babel/helper-annotate-as-pure@7.24.6": resolution: { - integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==, + integrity: sha512-DitEzDfOMnd13kZnDqns1ccmftwJTS9DMkyn9pYTxulS7bZxUxpMly3Nf23QQ6NwA4UB8lAqjbqWtyvElEMAkg==, } engines: { node: ">=6.9.0" } - "@babel/helper-environment-visitor@7.22.20": + "@babel/helper-builder-binary-assignment-operator-visitor@7.24.6": resolution: { - integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==, + integrity: sha512-+wnfqc5uHiMYtvRX7qu80Toef8BXeh4HHR1SPeonGb1SKPniNEd4a/nlaJJMv/OIEYvIVavvo0yR7u10Gqz0Iw==, } engines: { node: ">=6.9.0" } - "@babel/helper-function-name@7.23.0": + "@babel/helper-compilation-targets@7.24.6": resolution: { - integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==, + integrity: sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==, } engines: { node: ">=6.9.0" } - "@babel/helper-hoist-variables@7.22.5": + "@babel/helper-create-class-features-plugin@7.24.6": resolution: { - integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==, - } - engines: { node: ">=6.9.0" } - - "@babel/helper-module-imports@7.24.3": - resolution: - { - integrity: sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==, - } - engines: { node: ">=6.9.0" } - - "@babel/helper-module-transforms@7.24.5": - resolution: - { - integrity: sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==, + integrity: sha512-djsosdPJVZE6Vsw3kk7IPRWethP94WHGOhQTc67SNXE0ZzMhHgALw8iGmYS0TD1bbMM0VDROy43od7/hN6WYcA==, } engines: { node: ">=6.9.0" } peerDependencies: "@babel/core": ^7.0.0 - "@babel/helper-plugin-utils@7.24.5": + "@babel/helper-create-regexp-features-plugin@7.24.6": resolution: { - integrity: sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==, + integrity: sha512-C875lFBIWWwyv6MHZUG9HmRrlTDgOsLWZfYR0nW69gaKJNe0/Mpxx5r0EID2ZdHQkdUmQo2t0uNckTL08/1BgA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/helper-define-polyfill-provider@0.6.2": + resolution: + { + integrity: sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==, + } + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + + "@babel/helper-environment-visitor@7.24.6": + resolution: + { + integrity: sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==, } engines: { node: ">=6.9.0" } - "@babel/helper-simple-access@7.24.5": + "@babel/helper-function-name@7.24.6": resolution: { - integrity: sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==, + integrity: sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==, } engines: { node: ">=6.9.0" } - "@babel/helper-split-export-declaration@7.24.5": + "@babel/helper-hoist-variables@7.24.6": resolution: { - integrity: sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==, + integrity: sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==, } engines: { node: ">=6.9.0" } - "@babel/helper-string-parser@7.24.1": + "@babel/helper-member-expression-to-functions@7.24.6": resolution: { - integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==, + integrity: sha512-OTsCufZTxDUsv2/eDXanw/mUZHWOxSbEmC3pP8cgjcy5rgeVPWWMStnv274DV60JtHxTk0adT0QrCzC4M9NWGg==, } engines: { node: ">=6.9.0" } - "@babel/helper-validator-identifier@7.24.5": + "@babel/helper-module-imports@7.24.6": resolution: { - integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==, + integrity: sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==, } engines: { node: ">=6.9.0" } - "@babel/helper-validator-option@7.23.5": + "@babel/helper-module-transforms@7.24.6": resolution: { - integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==, + integrity: sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/helper-optimise-call-expression@7.24.6": + resolution: + { + integrity: sha512-3SFDJRbx7KuPRl8XDUr8O7GAEB8iGyWPjLKJh/ywP/Iy9WOmEfMrsWbaZpvBu2HSYn4KQygIsz0O7m8y10ncMA==, } engines: { node: ">=6.9.0" } - "@babel/helpers@7.24.5": + "@babel/helper-plugin-utils@7.24.6": resolution: { - integrity: sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==, + integrity: sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==, } engines: { node: ">=6.9.0" } - "@babel/highlight@7.24.5": + "@babel/helper-remap-async-to-generator@7.24.6": resolution: { - integrity: sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==, + integrity: sha512-1Qursq9ArRZPAMOZf/nuzVW8HgJLkTB9y9LfP4lW2MVp4e9WkLJDovfKBxoDcCk6VuzIxyqWHyBoaCtSRP10yg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/helper-replace-supers@7.24.6": + resolution: + { + integrity: sha512-mRhfPwDqDpba8o1F8ESxsEkJMQkUF8ZIWrAc0FtWhxnjfextxMWxr22RtFizxxSYLjVHDeMgVsRq8BBZR2ikJQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/helper-simple-access@7.24.6": + resolution: + { + integrity: sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==, } engines: { node: ">=6.9.0" } - "@babel/parser@7.24.5": + "@babel/helper-skip-transparent-expression-wrappers@7.24.6": resolution: { - integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==, + integrity: sha512-jhbbkK3IUKc4T43WadP96a27oYti9gEf1LdyGSP2rHGH77kwLwfhO7TgwnWvxxQVmke0ImmCSS47vcuxEMGD3Q==, + } + engines: { node: ">=6.9.0" } + + "@babel/helper-split-export-declaration@7.24.6": + resolution: + { + integrity: sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==, + } + engines: { node: ">=6.9.0" } + + "@babel/helper-string-parser@7.24.6": + resolution: + { + integrity: sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==, + } + engines: { node: ">=6.9.0" } + + "@babel/helper-validator-identifier@7.24.6": + resolution: + { + integrity: sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==, + } + engines: { node: ">=6.9.0" } + + "@babel/helper-validator-option@7.24.6": + resolution: + { + integrity: sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==, + } + engines: { node: ">=6.9.0" } + + "@babel/helper-wrap-function@7.24.6": + resolution: + { + integrity: sha512-f1JLrlw/jbiNfxvdrfBgio/gRBk3yTAEJWirpAkiJG2Hb22E7cEYKHWo0dFPTv/niPovzIdPdEDetrv6tC6gPQ==, + } + engines: { node: ">=6.9.0" } + + "@babel/helpers@7.24.6": + resolution: + { + integrity: sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==, + } + engines: { node: ">=6.9.0" } + + "@babel/highlight@7.24.6": + resolution: + { + integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==, + } + engines: { node: ">=6.9.0" } + + "@babel/parser@7.24.6": + resolution: + { + integrity: sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==, } engines: { node: ">=6.0.0" } hasBin: true - "@babel/plugin-transform-react-jsx-self@7.24.5": + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.24.6": resolution: { - integrity: sha512-RtCJoUO2oYrYwFPtR1/jkoBEcFuI1ae9a9IMxeyAVa3a1Ap4AnxmyIKG2b2FaJKqkidw/0cxRbWN+HOs6ZWd1w==, + integrity: sha512-bYndrJ6Ph6Ar+GaB5VAc0JPoP80bQCm4qon6JEzXfRl5QZyQ8Ur1K6k7htxWmPA5z+k7JQvaMUrtXlqclWYzKw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.6": + resolution: + { + integrity: sha512-iVuhb6poq5ikqRq2XWU6OQ+R5o9wF+r/or9CeUyovgptz0UlnK4/seOQ1Istu/XybYjAhQv1FRSSfHHufIku5Q==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.6": + resolution: + { + integrity: sha512-c8TER5xMDYzzFcGqOEp9l4hvB7dcbhcGjcLVwxWfe4P5DOafdwjsBJZKsmv+o3aXh7NhopvayQIovHrh2zSRUQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.13.0 + + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.6": + resolution: + { + integrity: sha512-z8zEjYmwBUHN/pCF3NuWBhHQjJCrd33qAi8MgANfMrAvn72k2cImT8VjK9LJFu4ysOLJqhfkYYb3MvwANRUNZQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2": + resolution: + { + integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==, } engines: { node: ">=6.9.0" } peerDependencies: "@babel/core": ^7.0.0-0 - "@babel/plugin-transform-react-jsx-source@7.24.1": + "@babel/plugin-syntax-async-generators@7.8.4": resolution: { - integrity: sha512-1v202n7aUq4uXAieRTKcwPzNyphlCuqHHDcdSNc+vdhoTEZcFMh+L5yZuCmGaIO7bs1nJUNfHB89TZyoL48xNA==, + integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-class-properties@7.12.13": + resolution: + { + integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-class-static-block@7.14.5": + resolution: + { + integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==, } engines: { node: ">=6.9.0" } peerDependencies: "@babel/core": ^7.0.0-0 - "@babel/runtime@7.24.5": + "@babel/plugin-syntax-dynamic-import@7.8.3": resolution: { - integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==, + integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-export-namespace-from@7.8.3": + resolution: + { + integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-import-assertions@7.24.6": + resolution: + { + integrity: sha512-BE6o2BogJKJImTmGpkmOic4V0hlRRxVtzqxiSPa8TIFxyhi4EFjHm08nq1M4STK4RytuLMgnSz0/wfflvGFNOg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-import-attributes@7.24.6": + resolution: + { + integrity: sha512-D+CfsVZousPXIdudSII7RGy52+dYRtbyKAZcvtQKq/NpsivyMVduepzcLqG5pMBugtMdedxdC8Ramdpcne9ZWQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-import-meta@7.10.4": + resolution: + { + integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-json-strings@7.8.3": + resolution: + { + integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-jsx@7.24.6": + resolution: + { + integrity: sha512-lWfvAIFNWMlCsU0DRUun2GpFwZdGTukLaHJqRh1JRb80NdAP5Sb1HDHB5X9P9OtgZHQl089UzQkpYlBq2VTPRw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-logical-assignment-operators@7.10.4": + resolution: + { + integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-nullish-coalescing-operator@7.8.3": + resolution: + { + integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-numeric-separator@7.10.4": + resolution: + { + integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-object-rest-spread@7.8.3": + resolution: + { + integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-optional-catch-binding@7.8.3": + resolution: + { + integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-optional-chaining@7.8.3": + resolution: + { + integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-private-property-in-object@7.14.5": + resolution: + { + integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-top-level-await@7.14.5": + resolution: + { + integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-typescript@7.24.6": + resolution: + { + integrity: sha512-TzCtxGgVTEJWWwcYwQhCIQ6WaKlo80/B+Onsk4RRCcYqpYGFcG9etPW94VToGte5AAcxRrhjPUFvUS3Y2qKi4A==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-syntax-unicode-sets-regex@7.18.6": + resolution: + { + integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/plugin-transform-arrow-functions@7.24.6": + resolution: + { + integrity: sha512-jSSSDt4ZidNMggcLx8SaKsbGNEfIl0PHx/4mFEulorE7bpYLbN0d3pDW3eJ7Y5Z3yPhy3L3NaPCYyTUY7TuugQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-async-generator-functions@7.24.6": + resolution: + { + integrity: sha512-VEP2o4iR2DqQU6KPgizTW2mnMx6BG5b5O9iQdrW9HesLkv8GIA8x2daXBQxw1MrsIkFQGA/iJ204CKoQ8UcnAA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-async-to-generator@7.24.6": + resolution: + { + integrity: sha512-NTBA2SioI3OsHeIn6sQmhvXleSl9T70YY/hostQLveWs0ic+qvbA3fa0kwAwQ0OA/XGaAerNZRQGJyRfhbJK4g==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-block-scoped-functions@7.24.6": + resolution: + { + integrity: sha512-XNW7jolYHW9CwORrZgA/97tL/k05qe/HL0z/qqJq1mdWhwwCM6D4BJBV7wAz9HgFziN5dTOG31znkVIzwxv+vw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-block-scoping@7.24.6": + resolution: + { + integrity: sha512-S/t1Xh4ehW7sGA7c1j/hiOBLnEYCp/c2sEG4ZkL8kI1xX9tW2pqJTCHKtdhe/jHKt8nG0pFCrDHUXd4DvjHS9w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-class-properties@7.24.6": + resolution: + { + integrity: sha512-j6dZ0Z2Z2slWLR3kt9aOmSIrBvnntWjMDN/TVcMPxhXMLmJVqX605CBRlcGI4b32GMbfifTEsdEjGjiE+j/c3A==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-class-static-block@7.24.6": + resolution: + { + integrity: sha512-1QSRfoPI9RoLRa8Mnakc6v3e0gJxiZQTYrMfLn+mD0sz5+ndSzwymp2hDcYJTyT0MOn0yuWzj8phlIvO72gTHA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.12.0 + + "@babel/plugin-transform-classes@7.24.6": + resolution: + { + integrity: sha512-+fN+NO2gh8JtRmDSOB6gaCVo36ha8kfCW1nMq2Gc0DABln0VcHN4PrALDvF5/diLzIRKptC7z/d7Lp64zk92Fg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-computed-properties@7.24.6": + resolution: + { + integrity: sha512-cRzPobcfRP0ZtuIEkA8QzghoUpSB3X3qSH5W2+FzG+VjWbJXExtx0nbRqwumdBN1x/ot2SlTNQLfBCnPdzp6kg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-destructuring@7.24.6": + resolution: + { + integrity: sha512-YLW6AE5LQpk5npNXL7i/O+U9CE4XsBCuRPgyjl1EICZYKmcitV+ayuuUGMJm2lC1WWjXYszeTnIxF/dq/GhIZQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-dotall-regex@7.24.6": + resolution: + { + integrity: sha512-rCXPnSEKvkm/EjzOtLoGvKseK+dS4kZwx1HexO3BtRtgL0fQ34awHn34aeSHuXtZY2F8a1X8xqBBPRtOxDVmcA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-duplicate-keys@7.24.6": + resolution: + { + integrity: sha512-/8Odwp/aVkZwPFJMllSbawhDAO3UJi65foB00HYnK/uXvvCPm0TAXSByjz1mpRmp0q6oX2SIxpkUOpPFHk7FLA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-dynamic-import@7.24.6": + resolution: + { + integrity: sha512-vpq8SSLRTBLOHUZHSnBqVo0AKX3PBaoPs2vVzYVWslXDTDIpwAcCDtfhUcHSQQoYoUvcFPTdC8TZYXu9ZnLT/w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-exponentiation-operator@7.24.6": + resolution: + { + integrity: sha512-EemYpHtmz0lHE7hxxxYEuTYOOBZ43WkDgZ4arQ4r+VX9QHuNZC+WH3wUWmRNvR8ECpTRne29aZV6XO22qpOtdA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-export-namespace-from@7.24.6": + resolution: + { + integrity: sha512-inXaTM1SVrIxCkIJ5gqWiozHfFMStuGbGJAxZFBoHcRRdDP0ySLb3jH6JOwmfiinPwyMZqMBX+7NBDCO4z0NSA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-for-of@7.24.6": + resolution: + { + integrity: sha512-n3Sf72TnqK4nw/jziSqEl1qaWPbCRw2CziHH+jdRYvw4J6yeCzsj4jdw8hIntOEeDGTmHVe2w4MVL44PN0GMzg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-function-name@7.24.6": + resolution: + { + integrity: sha512-sOajCu6V0P1KPljWHKiDq6ymgqB+vfo3isUS4McqW1DZtvSVU2v/wuMhmRmkg3sFoq6GMaUUf8W4WtoSLkOV/Q==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-json-strings@7.24.6": + resolution: + { + integrity: sha512-Uvgd9p2gUnzYJxVdBLcU0KurF8aVhkmVyMKW4MIY1/BByvs3EBpv45q01o7pRTVmTvtQq5zDlytP3dcUgm7v9w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-literals@7.24.6": + resolution: + { + integrity: sha512-f2wHfR2HF6yMj+y+/y07+SLqnOSwRp8KYLpQKOzS58XLVlULhXbiYcygfXQxJlMbhII9+yXDwOUFLf60/TL5tw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-logical-assignment-operators@7.24.6": + resolution: + { + integrity: sha512-EKaWvnezBCMkRIHxMJSIIylzhqK09YpiJtDbr2wsXTwnO0TxyjMUkaw4RlFIZMIS0iDj0KyIg7H7XCguHu/YDA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-member-expression-literals@7.24.6": + resolution: + { + integrity: sha512-9g8iV146szUo5GWgXpRbq/GALTnY+WnNuRTuRHWWFfWGbP9ukRL0aO/jpu9dmOPikclkxnNsjY8/gsWl6bmZJQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-modules-amd@7.24.6": + resolution: + { + integrity: sha512-eAGogjZgcwqAxhyFgqghvoHRr+EYRQPFjUXrTYKBRb5qPnAVxOOglaxc4/byHqjvq/bqO2F3/CGwTHsgKJYHhQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-modules-commonjs@7.24.6": + resolution: + { + integrity: sha512-JEV8l3MHdmmdb7S7Cmx6rbNEjRCgTQMZxllveHO0mx6uiclB0NflCawlQQ6+o5ZrwjUBYPzHm2XoK4wqGVUFuw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-modules-systemjs@7.24.6": + resolution: + { + integrity: sha512-xg1Z0J5JVYxtpX954XqaaAT6NpAY6LtZXvYFCJmGFJWwtlz2EmJoR8LycFRGNE8dBKizGWkGQZGegtkV8y8s+w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-modules-umd@7.24.6": + resolution: + { + integrity: sha512-esRCC/KsSEUvrSjv5rFYnjZI6qv4R1e/iHQrqwbZIoRJqk7xCvEUiN7L1XrmW5QSmQe3n1XD88wbgDTWLbVSyg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-named-capturing-groups-regex@7.24.6": + resolution: + { + integrity: sha512-6DneiCiu91wm3YiNIGDWZsl6GfTTbspuj/toTEqLh9d4cx50UIzSdg+T96p8DuT7aJOBRhFyaE9ZvTHkXrXr6Q==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/plugin-transform-new-target@7.24.6": + resolution: + { + integrity: sha512-f8liz9JG2Va8A4J5ZBuaSdwfPqN6axfWRK+y66fjKYbwf9VBLuq4WxtinhJhvp1w6lamKUwLG0slK2RxqFgvHA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-nullish-coalescing-operator@7.24.6": + resolution: + { + integrity: sha512-+QlAiZBMsBK5NqrBWFXCYeXyiU1y7BQ/OYaiPAcQJMomn5Tyg+r5WuVtyEuvTbpV7L25ZSLfE+2E9ywj4FD48A==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-numeric-separator@7.24.6": + resolution: + { + integrity: sha512-6voawq8T25Jvvnc4/rXcWZQKKxUNZcKMS8ZNrjxQqoRFernJJKjE3s18Qo6VFaatG5aiX5JV1oPD7DbJhn0a4Q==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-object-rest-spread@7.24.6": + resolution: + { + integrity: sha512-OKmi5wiMoRW5Smttne7BwHM8s/fb5JFs+bVGNSeHWzwZkWXWValR1M30jyXo1s/RaqgwwhEC62u4rFH/FBcBPg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-object-super@7.24.6": + resolution: + { + integrity: sha512-N/C76ihFKlZgKfdkEYKtaRUtXZAgK7sOY4h2qrbVbVTXPrKGIi8aww5WGe/+Wmg8onn8sr2ut6FXlsbu/j6JHg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-optional-catch-binding@7.24.6": + resolution: + { + integrity: sha512-L5pZ+b3O1mSzJ71HmxSCmTVd03VOT2GXOigug6vDYJzE5awLI7P1g0wFcdmGuwSDSrQ0L2rDOe/hHws8J1rv3w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-optional-chaining@7.24.6": + resolution: + { + integrity: sha512-cHbqF6l1QP11OkYTYQ+hhVx1E017O5ZcSPXk9oODpqhcAD1htsWG2NpHrrhthEO2qZomLK0FXS+u7NfrkF5aOQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-parameters@7.24.6": + resolution: + { + integrity: sha512-ST7guE8vLV+vI70wmAxuZpIKzVjvFX9Qs8bl5w6tN/6gOypPWUmMQL2p7LJz5E63vEGrDhAiYetniJFyBH1RkA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-private-methods@7.24.6": + resolution: + { + integrity: sha512-T9LtDI0BgwXOzyXrvgLTT8DFjCC/XgWLjflczTLXyvxbnSR/gpv0hbmzlHE/kmh9nOvlygbamLKRo6Op4yB6aw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-private-property-in-object@7.24.6": + resolution: + { + integrity: sha512-Qu/ypFxCY5NkAnEhCF86Mvg3NSabKsh/TPpBVswEdkGl7+FbsYHy1ziRqJpwGH4thBdQHh8zx+z7vMYmcJ7iaQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-property-literals@7.24.6": + resolution: + { + integrity: sha512-oARaglxhRsN18OYsnPTpb8TcKQWDYNsPNmTnx5++WOAsUJ0cSC/FZVlIJCKvPbU4yn/UXsS0551CFKJhN0CaMw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-react-display-name@7.24.6": + resolution: + { + integrity: sha512-/3iiEEHDsJuj9QU09gbyWGSUxDboFcD7Nj6dnHIlboWSodxXAoaY/zlNMHeYAC0WsERMqgO9a7UaM77CsYgWcg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-react-jsx-development@7.24.6": + resolution: + { + integrity: sha512-F7EsNp5StNDouSSdYyDSxh4J+xvj/JqG+Cb6s2fA+jCyHOzigG5vTwgH8tU2U8Voyiu5zCG9bAK49wTr/wPH0w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-react-jsx-self@7.24.6": + resolution: + { + integrity: sha512-FfZfHXtQ5jYPQsCRyLpOv2GeLIIJhs8aydpNh39vRDjhD411XcfWDni5i7OjP/Rs8GAtTn7sWFFELJSHqkIxYg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-react-jsx-source@7.24.6": + resolution: + { + integrity: sha512-BQTBCXmFRreU3oTUXcGKuPOfXAGb1liNY4AvvFKsOBAJ89RKcTsIrSsnMYkj59fNa66OFKnSa4AJZfy5Y4B9WA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-react-jsx@7.24.6": + resolution: + { + integrity: sha512-pCtPHhpRZHfwdA5G1Gpk5mIzMA99hv0R8S/Ket50Rw+S+8hkt3wBWqdqHaPw0CuUYxdshUgsPiLQ5fAs4ASMhw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-react-pure-annotations@7.24.6": + resolution: + { + integrity: sha512-0HoDQlFJJkXRyV2N+xOpUETbKHcouSwijRQbKWVtxsPoq5bbB30qZag9/pSc5xcWVYjTHlLsBsY+hZDnzQTPNw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-regenerator@7.24.6": + resolution: + { + integrity: sha512-SMDxO95I8WXRtXhTAc8t/NFQUT7VYbIWwJCJgEli9ml4MhqUMh4S6hxgH6SmAC3eAQNWCDJFxcFeEt9w2sDdXg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-reserved-words@7.24.6": + resolution: + { + integrity: sha512-DcrgFXRRlK64dGE0ZFBPD5egM2uM8mgfrvTMOSB2yKzOtjpGegVYkzh3s1zZg1bBck3nkXiaOamJUqK3Syk+4A==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-shorthand-properties@7.24.6": + resolution: + { + integrity: sha512-xnEUvHSMr9eOWS5Al2YPfc32ten7CXdH7Zwyyk7IqITg4nX61oHj+GxpNvl+y5JHjfN3KXE2IV55wAWowBYMVw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-spread@7.24.6": + resolution: + { + integrity: sha512-h/2j7oIUDjS+ULsIrNZ6/TKG97FgmEk1PXryk/HQq6op4XUUUwif2f69fJrzK0wza2zjCS1xhXmouACaWV5uPA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-sticky-regex@7.24.6": + resolution: + { + integrity: sha512-fN8OcTLfGmYv7FnDrsjodYBo1DhPL3Pze/9mIIE2MGCT1KgADYIOD7rEglpLHZj8PZlC/JFX5WcD+85FLAQusw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-template-literals@7.24.6": + resolution: + { + integrity: sha512-BJbEqJIcKwrqUP+KfUIkxz3q8VzXe2R8Wv8TaNgO1cx+nNavxn/2+H8kp9tgFSOL6wYPPEgFvU6IKS4qoGqhmg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-typeof-symbol@7.24.6": + resolution: + { + integrity: sha512-IshCXQ+G9JIFJI7bUpxTE/oA2lgVLAIK8q1KdJNoPXOpvRaNjMySGuvLfBw/Xi2/1lLo953uE8hyYSDW3TSYig==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-typescript@7.24.6": + resolution: + { + integrity: sha512-H0i+hDLmaYYSt6KU9cZE0gb3Cbssa/oxWis7PX4ofQzbvsfix9Lbh8SRk7LCPDlLWJHUiFeHU0qRRpF/4Zv7mQ==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-unicode-escapes@7.24.6": + resolution: + { + integrity: sha512-bKl3xxcPbkQQo5eX9LjjDpU2xYHeEeNQbOhj0iPvetSzA+Tu9q/o5lujF4Sek60CM6MgYvOS/DJuwGbiEYAnLw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-unicode-property-regex@7.24.6": + resolution: + { + integrity: sha512-8EIgImzVUxy15cZiPii9GvLZwsy7Vxc+8meSlR3cXFmBIl5W5Tn9LGBf7CDKkHj4uVfNXCJB8RsVfnmY61iedA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-unicode-regex@7.24.6": + resolution: + { + integrity: sha512-pssN6ExsvxaKU638qcWb81RrvvgZom3jDgU/r5xFZ7TONkZGFf4MhI2ltMb8OcQWhHyxgIavEU+hgqtbKOmsPA==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/plugin-transform-unicode-sets-regex@7.24.6": + resolution: + { + integrity: sha512-quiMsb28oXWIDK0gXLALOJRXLgICLiulqdZGOaPPd0vRT7fQp74NtdADAVu+D8s00C+0Xs0MxVP0VKF/sZEUgw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0 + + "@babel/preset-env@7.24.6": + resolution: + { + integrity: sha512-CrxEAvN7VxfjOG8JNF2Y/eMqMJbZPZ185amwGUBp8D9USK90xQmv7dLdFSa+VbD7fdIqcy/Mfv7WtzG8+/qxKg==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/preset-modules@0.1.6-no-external-plugins": + resolution: + { + integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==, + } + peerDependencies: + "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0 + + "@babel/preset-react@7.24.6": + resolution: + { + integrity: sha512-8mpzh1bWvmINmwM3xpz6ahu57mNaWavMm+wBNjQ4AFu1nghKBiIRET7l/Wmj4drXany/BBGjJZngICcD98F1iw==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/preset-typescript@7.24.6": + resolution: + { + integrity: sha512-U10aHPDnokCFRXgyT/MaIRTivUu2K/mu0vJlwRS9LxJmJet+PFQNKpggPyFCUtC6zWSBPjvxjnpNkAn3Uw2m5w==, + } + engines: { node: ">=6.9.0" } + peerDependencies: + "@babel/core": ^7.0.0-0 + + "@babel/regjsgen@0.8.0": + resolution: + { + integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==, + } + + "@babel/runtime@7.24.6": + resolution: + { + integrity: sha512-Ja18XcETdEl5mzzACGd+DKgaGJzPTCow7EglgwTmHdwokzDFYh/MHua6lU6DV/hjF2IaOJ4oX2nqnjG7RElKOw==, } engines: { node: ">=6.9.0" } - "@babel/template@7.24.0": + "@babel/template@7.24.6": resolution: { - integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==, + integrity: sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==, } engines: { node: ">=6.9.0" } - "@babel/traverse@7.24.5": + "@babel/traverse@7.24.6": resolution: { - integrity: sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==, + integrity: sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==, } engines: { node: ">=6.9.0" } - "@babel/types@7.24.5": + "@babel/types@7.24.6": resolution: { - integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==, + integrity: sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==, } engines: { node: ">=6.9.0" } @@ -720,10 +1549,10 @@ packages: } engines: { node: ">=14" } - "@floating-ui/core@1.6.1": + "@floating-ui/core@1.6.2": resolution: { - integrity: sha512-42UH54oPZHPdRHdw6BgoBD6cg/eVTmVrFcgeRDM3jbO7uxSoipVcmcIGFcA5jmOHO5apcyvBhkSKES3fQJnu7A==, + integrity: sha512-+2XpQV9LLZeanU4ZevzRnGFg2neDeKHgFLjP6YLW+tly0IvrhqT4u8enLGjLH3qeh85g19xY5rsAusfwTdn5lg==, } "@floating-ui/dom@1.6.5": @@ -732,10 +1561,10 @@ packages: integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==, } - "@floating-ui/react-dom@2.0.9": + "@floating-ui/react-dom@2.1.0": resolution: { - integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==, + integrity: sha512-lNzj5EQmEKn5FFKc04+zasr09h/uX8RtJRNj5gUXsSQIXHVWTVh+hVAg1vOMCexkX8EgvemMvIFpQfkosnVNyA==, } peerDependencies: react: ">=16.8.0" @@ -814,16 +1643,16 @@ packages: "@types/react": optional: true - "@mui/core-downloads-tracker@5.15.16": + "@mui/core-downloads-tracker@5.15.18": resolution: { - integrity: sha512-PTIbMJs5C/vYMfyJNW8ArOezh4eyHkg2pTeA7bBxh2kLP1Uzs0Nm+krXWbWGJPwTWjM8EhnDrr4aCF26+2oleg==, + integrity: sha512-/9pVk+Al8qxAjwFUADv4BRZgMpZM4m5E+2Q/20qhVPuIJWqKp4Ie4tGExac6zu93rgPTYVQGgu+1vjiT0E+cEw==, } - "@mui/icons-material@5.15.16": + "@mui/icons-material@5.15.18": resolution: { - integrity: sha512-s8vYbyACzTNZRKv+20fCfVXJwJqNcVotns2EKnu1wmAga6wv2LAo5kB1d5yqQqZlMFtp34EJvRXf7cy8X0tJVA==, + integrity: sha512-jGhyw02TSLM0NgW+MDQRLLRUD/K4eN9rlK2pTBTL1OtzyZmQ8nB060zK1wA0b7cVrIiG+zyrRmNAvGWXwm2N9Q==, } engines: { node: ">=12.0.0" } peerDependencies: @@ -855,10 +1684,10 @@ packages: "@types/react": optional: true - "@mui/material@5.15.16": + "@mui/material@5.15.18": resolution: { - integrity: sha512-ery2hFReewko9gpDBqOr2VmXwQG9ifXofPhGzIx09/b9JqCQC/06kZXZDGGrOTpIddK9HlIf4yrS+G70jPAzUQ==, + integrity: sha512-n+/dsiqux74fFfcRUJjok+ieNQ7+BEk6/OwX9cLcLvriZrZb+/7Y8+Fd2HlUUbn5N0CDurgAHm0VH1DqyJ9HAw==, } engines: { node: ">=12.0.0" } peerDependencies: @@ -947,10 +1776,10 @@ packages: "@types/react": optional: true - "@mui/x-data-grid@6.19.11": + "@mui/x-data-grid@6.20.0": resolution: { - integrity: sha512-QsUp2cPkjUm8vyTR5gYWuCFqxspljOzElbCm412wzvMTJSKaB0kz7CEecFhxjlsMjQ8B7kY8oDF3LXjjucFcPQ==, + integrity: sha512-N9a4eJRmWgP5zT2AZ41BnBgCSQJiw4dc5Q2U9zQ5aOhOs+8Jb218tX79MIAfwt1s4rbTZmgAdsBUn9Xs93Kmrw==, } engines: { node: ">=14.0.0" } peerDependencies: @@ -1044,13 +1873,29 @@ packages: integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==, } - "@remix-run/router@1.16.0": + "@remix-run/router@1.16.1": resolution: { - integrity: sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==, + integrity: sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==, } engines: { node: ">=14.0.0" } + "@rollup/plugin-babel@6.0.4": + resolution: + { + integrity: sha512-YF7Y52kFdFT/xVSuVdjkV5ZdX/3YtmX0QulG+x0taQOtJdHYzVU61aSSkAgVJ7NOv6qPkIYiJSgSWWN/DM5sGw==, + } + engines: { node: ">=14.0.0" } + peerDependencies: + "@babel/core": ^7.0.0 + "@types/babel__core": ^7.1.9 + rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 + peerDependenciesMeta: + "@types/babel__core": + optional: true + rollup: + optional: true + "@rollup/pluginutils@5.1.0": resolution: { @@ -1063,130 +1908,130 @@ packages: rollup: optional: true - "@rollup/rollup-android-arm-eabi@4.17.2": + "@rollup/rollup-android-arm-eabi@4.18.0": resolution: { - integrity: sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==, + integrity: sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==, } cpu: [arm] os: [android] - "@rollup/rollup-android-arm64@4.17.2": + "@rollup/rollup-android-arm64@4.18.0": resolution: { - integrity: sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==, + integrity: sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==, } cpu: [arm64] os: [android] - "@rollup/rollup-darwin-arm64@4.17.2": + "@rollup/rollup-darwin-arm64@4.18.0": resolution: { - integrity: sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==, + integrity: sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==, } cpu: [arm64] os: [darwin] - "@rollup/rollup-darwin-x64@4.17.2": + "@rollup/rollup-darwin-x64@4.18.0": resolution: { - integrity: sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==, + integrity: sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==, } cpu: [x64] os: [darwin] - "@rollup/rollup-linux-arm-gnueabihf@4.17.2": + "@rollup/rollup-linux-arm-gnueabihf@4.18.0": resolution: { - integrity: sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==, + integrity: sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==, } cpu: [arm] os: [linux] - "@rollup/rollup-linux-arm-musleabihf@4.17.2": + "@rollup/rollup-linux-arm-musleabihf@4.18.0": resolution: { - integrity: sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==, + integrity: sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==, } cpu: [arm] os: [linux] - "@rollup/rollup-linux-arm64-gnu@4.17.2": + "@rollup/rollup-linux-arm64-gnu@4.18.0": resolution: { - integrity: sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==, + integrity: sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==, } cpu: [arm64] os: [linux] - "@rollup/rollup-linux-arm64-musl@4.17.2": + "@rollup/rollup-linux-arm64-musl@4.18.0": resolution: { - integrity: sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==, + integrity: sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==, } cpu: [arm64] os: [linux] - "@rollup/rollup-linux-powerpc64le-gnu@4.17.2": + "@rollup/rollup-linux-powerpc64le-gnu@4.18.0": resolution: { - integrity: sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==, + integrity: sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==, } cpu: [ppc64] os: [linux] - "@rollup/rollup-linux-riscv64-gnu@4.17.2": + "@rollup/rollup-linux-riscv64-gnu@4.18.0": resolution: { - integrity: sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==, + integrity: sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==, } cpu: [riscv64] os: [linux] - "@rollup/rollup-linux-s390x-gnu@4.17.2": + "@rollup/rollup-linux-s390x-gnu@4.18.0": resolution: { - integrity: sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==, + integrity: sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==, } cpu: [s390x] os: [linux] - "@rollup/rollup-linux-x64-gnu@4.17.2": + "@rollup/rollup-linux-x64-gnu@4.18.0": resolution: { - integrity: sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==, + integrity: sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==, } cpu: [x64] os: [linux] - "@rollup/rollup-linux-x64-musl@4.17.2": + "@rollup/rollup-linux-x64-musl@4.18.0": resolution: { - integrity: sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==, + integrity: sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==, } cpu: [x64] os: [linux] - "@rollup/rollup-win32-arm64-msvc@4.17.2": + "@rollup/rollup-win32-arm64-msvc@4.18.0": resolution: { - integrity: sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==, + integrity: sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==, } cpu: [arm64] os: [win32] - "@rollup/rollup-win32-ia32-msvc@4.17.2": + "@rollup/rollup-win32-ia32-msvc@4.18.0": resolution: { - integrity: sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==, + integrity: sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==, } cpu: [ia32] os: [win32] - "@rollup/rollup-win32-x64-msvc@4.17.2": + "@rollup/rollup-win32-x64-msvc@4.18.0": resolution: { - integrity: sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==, + integrity: sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==, } cpu: [x64] os: [win32] @@ -1295,107 +2140,107 @@ packages: peerDependencies: "@svgr/core": "*" - "@tauri-apps/api@1.5.4": + "@tauri-apps/api@1.5.6": resolution: { - integrity: sha512-LKYae9URbdEdbHrOXBeXb/lZgVyWTX0E98rSFBuQlmkLr8OeG+akuE41PfLjBVyk1Q+fq7wxo4ieenLSMUAUhA==, + integrity: sha512-LH5ToovAHnDVe5Qa9f/+jW28I6DeMhos8bNDtBOmmnaDpPmJmYLyHdeDblAWWWYc7KKRDg9/66vMuKyq0WIeFA==, } engines: { node: ">= 14.6.0", npm: ">= 6.6.0", yarn: ">= 1.19.1" } - "@tauri-apps/cli-darwin-arm64@1.5.13": + "@tauri-apps/cli-darwin-arm64@1.5.14": resolution: { - integrity: sha512-wXsBp6FIsQ1yoAEJ8dao7BkVdOp5xlfgGyAbJVCFKU3LTUqKw4A+ayxO6CV2lFfSaOdzdU86z+eJsl38nzmoSg==, + integrity: sha512-lxoSOp3KKSqzHJa7iT32dukPGMlfsTuja1xXSgwR8o/fqzpYJY7FY/3ZxesP8HR66FcK+vtqa//HNqeOQ0mHkA==, } engines: { node: ">= 10" } cpu: [arm64] os: [darwin] - "@tauri-apps/cli-darwin-x64@1.5.13": + "@tauri-apps/cli-darwin-x64@1.5.14": resolution: { - integrity: sha512-1I/8Q8ogr1P1iQhjsXw0DSPjb8r2ggx2h52X1NXODhBknWIG7Y3rPDnRSXg1qoauRi19728BmP/CSW6MugidwQ==, + integrity: sha512-EXSwN1n5spfG8FoXuyc90ACtmDJXzaZ1gxyENaq9xEpQoo7j/Q1vb6qXxmr6azKr8zmqY4h08ZFbv3exh93xJg==, } engines: { node: ">= 10" } cpu: [x64] os: [darwin] - "@tauri-apps/cli-linux-arm-gnueabihf@1.5.13": + "@tauri-apps/cli-linux-arm-gnueabihf@1.5.14": resolution: { - integrity: sha512-IHtE8YGZ4KV0fX8w6a8lftFGLsDCr/kbikKIgvUQdypImToCr4MKbyKQ6guwSGPlCExtHpD7+LOtFoRocLCtBw==, + integrity: sha512-Yb8BH/KYR7Tl+de40sZPfrqbhcU3Jlu+UPIrnXt05sjn48xqIps74Xjz8zzVp0TuHxUp8FmIGtCVhQgsbrsvvg==, } engines: { node: ">= 10" } cpu: [arm] os: [linux] - "@tauri-apps/cli-linux-arm64-gnu@1.5.13": + "@tauri-apps/cli-linux-arm64-gnu@1.5.14": resolution: { - integrity: sha512-U01Jvr0YoBwqRJ1lf+lzFRrNwhfdP4HF/3p1ahFzSoQ6CuYk0pL1jYmsYA7PigKmmovu8ctNq9E9quSdquOIeQ==, + integrity: sha512-QrKHP4gRaHiup478rPBZ+BmNd88yze9jMmheoNy9mN1K/aECRmTHO+tWhsxv5moFHZzRhO0QDWxxvTtiaPXaGg==, } engines: { node: ">= 10" } cpu: [arm64] os: [linux] - "@tauri-apps/cli-linux-arm64-musl@1.5.13": + "@tauri-apps/cli-linux-arm64-musl@1.5.14": resolution: { - integrity: sha512-+UVxc5yQavLWnsFCDYXp4HxDxhyuDt+V2IOdy+ClO/xJ8ii5vFz1QYQBm9s1ofXWPXn5BYyBVNhGuPstAYcO9A==, + integrity: sha512-Hb1C1VMxmUcyGjW/K/INKF87zzzgLEVRmWZZnQd7M1P4uue4xPyIwUELSdX12Z2jREPgmLW4AXPD0m6wsNu7iw==, } engines: { node: ">= 10" } cpu: [arm64] os: [linux] - "@tauri-apps/cli-linux-x64-gnu@1.5.13": + "@tauri-apps/cli-linux-x64-gnu@1.5.14": resolution: { - integrity: sha512-QDIkbpMprEe08V9Yn+XMbQa2ErY9Cj6TlvcSGLzida4gAVHwf42AMxBBFSvjpdMyB7D5lJMsDSq5xhEeRPs/HQ==, + integrity: sha512-kD9v/UwPDuhIgq2TJj/s2/7rqk+vmExVV6xHPKI8vVbIvlNAOZqmx3fpxjej1241vhJ/piGd/m6q6YMWGsL0oQ==, } engines: { node: ">= 10" } cpu: [x64] os: [linux] - "@tauri-apps/cli-linux-x64-musl@1.5.13": + "@tauri-apps/cli-linux-x64-musl@1.5.14": resolution: { - integrity: sha512-7JHNrF0b8Y7R693SG8JWhWmt/3d6vhyswEu26NUxQG2IYQlVY51sDPkub7S1cynh4++7CMV5sNK0EUr6hLrR9A==, + integrity: sha512-204Drgg9Zx0+THKndqASz4+iPCwqA3gQVF9C0CDIArNXrjPyJjVvW8VP5CHiZYaTNWxlz/ltyxluM6UFWbXNFw==, } engines: { node: ">= 10" } cpu: [x64] os: [linux] - "@tauri-apps/cli-win32-arm64-msvc@1.5.13": + "@tauri-apps/cli-win32-arm64-msvc@1.5.14": resolution: { - integrity: sha512-p+j3IcrPnQ7/iaMlrdDBGT2SlB6MzjTbSdLo1jNE3DAeO98jByIJZyNme07Fv87280+2LXVB5XtusCsgTwIHCw==, + integrity: sha512-sqPSni2MnWNCm+8YZnLdWCclxfSHaYqKuPFSz8q7Tn1G1m/cA9gyPoC1G0esHftY7bu/ZM5lB4kM3I4U0KlLiA==, } engines: { node: ">= 10" } cpu: [arm64] os: [win32] - "@tauri-apps/cli-win32-ia32-msvc@1.5.13": + "@tauri-apps/cli-win32-ia32-msvc@1.5.14": resolution: { - integrity: sha512-ypxRAGd8QYOCaBUmqzvHvrzj64OgfhzZQS/TSQlKWeJ9X1oQzQDNUrifsdaZZvZBf9yqSRf8lMYoN5qFjrHZfA==, + integrity: sha512-8xN8W0zTs8oFsQmvYLxHFeqhzVI7oTaPK1xQMc5gbpFP45jN41c21aCXfjnvzT+h90EfCHUF9EWj2HTEJSb7Iw==, } engines: { node: ">= 10" } cpu: [ia32] os: [win32] - "@tauri-apps/cli-win32-x64-msvc@1.5.13": + "@tauri-apps/cli-win32-x64-msvc@1.5.14": resolution: { - integrity: sha512-B3YDAyZb8f6zKqZj/ydL/cQVkT/KxNyumXsX+UL4oM5E2DM89OD5BxMgqGr7zwmJSaRNRHkXRK+BMluvZjHG9w==, + integrity: sha512-U0slee5tNM2PYECBpPHavLSwkT3szGMZ+qhcikQQbDan84bQdLn/kHWjyXOgLJs4KSve4+KxcrN+AVqj0VyHnw==, } engines: { node: ">= 10" } cpu: [x64] os: [win32] - "@tauri-apps/cli@1.5.13": + "@tauri-apps/cli@1.5.14": resolution: { - integrity: sha512-wULOJNb/Dxc/E+Z0+7MkaqKYAmdjGJEFpZ5xcNhvC3BVX1O6MbhHjXGfwfu4mgIGhVqY1KJaKoXx7EDZAlk7Pw==, + integrity: sha512-JOSMKymlg116UdEXSj69eg5p1OtZnQkUE0qIGbtNDO1sk3X/KgBN6+oHBW0BzPStp/W0AjBgrMWCqjHPwEpOug==, } engines: { node: ">= 10" } hasBin: true @@ -1418,10 +2263,10 @@ packages: integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==, } - "@types/babel__traverse@7.20.5": + "@types/babel__traverse@7.20.6": resolution: { - integrity: sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==, + integrity: sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==, } "@types/debug@4.1.12": @@ -1472,16 +2317,16 @@ packages: integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==, } - "@types/lodash@4.17.1": + "@types/lodash@4.17.4": resolution: { - integrity: sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==, + integrity: sha512-wYCP26ZLxaT3R39kiN2+HcJ4kTd3U1waI/cY7ivWYqFP6pW3ZNpvi6Wd6PHZx7T/t8z0vlkXMg3QYLa7DZ/IJQ==, } - "@types/mdast@4.0.3": + "@types/mdast@4.0.4": resolution: { - integrity: sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==, + integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==, } "@types/ms@0.7.34": @@ -1490,10 +2335,10 @@ packages: integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==, } - "@types/node@20.12.10": + "@types/node@20.12.12": resolution: { - integrity: sha512-Eem5pH9pmWBHoGAT8Dr5fdc5rYA+4NAovdM4EktRPVAAiJhmWWfQrA0cFhAbOsQdSfIHjAud6YdkbL69+zSKjw==, + integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==, } "@types/parse-json@4.0.2": @@ -1520,10 +2365,10 @@ packages: integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==, } - "@types/react@18.3.1": + "@types/react@18.3.3": resolution: { - integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==, + integrity: sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==, } "@types/unist@2.0.10": @@ -1544,10 +2389,10 @@ packages: integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==, } - "@vitejs/plugin-react@4.2.1": + "@vitejs/plugin-react@4.3.0": resolution: { - integrity: sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==, + integrity: sha512-KcEbMsn4Dpk+LIbHMj7gDPRKaTMStxxWRkRmxsg/jVdFdJCZWt1SchZcf0M4t8lIKdwwMsEyzhrcOXRrDPtOBw==, } engines: { node: ^14.18.0 || >=16.0.0 } peerDependencies: @@ -1567,10 +2412,10 @@ packages: } engines: { node: ">= 6.0.0" } - ahooks@3.7.11: + ahooks@3.8.0: resolution: { - integrity: sha512-BfSq7HJ9wk/7a2vX7WbLdwzHyQHmbNe21ipX1PfIzssXIzQfAl79WVJ9GjZaqNl4PFPsJusj/Xjg2OF+gIgGaQ==, + integrity: sha512-M01m+mxLRNNeJ/PCT3Fom26UyreTj6oMqJBetUrJnK4VNI5j6eMA543Xxo53OBXn6XibA2FXKcCCgrT6YCTtKQ==, } engines: { node: ">=8.0.0" } peerDependencies: @@ -1602,10 +2447,10 @@ packages: integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==, } - axios@1.6.8: + axios@1.7.2: resolution: { - integrity: sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==, + integrity: sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==, } babel-plugin-macros@3.1.0: @@ -1615,6 +2460,30 @@ packages: } engines: { node: ">=10", npm: ">=6" } + babel-plugin-polyfill-corejs2@0.4.11: + resolution: + { + integrity: sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==, + } + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + + babel-plugin-polyfill-corejs3@0.10.4: + resolution: + { + integrity: sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==, + } + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + + babel-plugin-polyfill-regenerator@0.6.2: + resolution: + { + integrity: sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==, + } + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + bail@2.0.2: resolution: { @@ -1634,10 +2503,10 @@ packages: } engines: { node: ">=8" } - braces@3.0.2: + braces@3.0.3: resolution: { - integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==, + integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==, } engines: { node: ">=8" } @@ -1663,10 +2532,10 @@ packages: } engines: { node: ">=10" } - caniuse-lite@1.0.30001616: + caniuse-lite@1.0.30001623: resolution: { - integrity: sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==, + integrity: sha512-X/XhAVKlpIxWPpgRTnlgZssJrF0m6YtRA0QDWgsBNT12uZM6LPRydR7ip405Y3t1LamD8cP2TZFEDZFBf5ApcA==, } ccount@2.0.1: @@ -1764,6 +2633,12 @@ packages: integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==, } + core-js-compat@3.37.1: + resolution: + { + integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==, + } + cosmiconfig@7.1.0: resolution: { @@ -1873,10 +2748,10 @@ packages: integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==, } - electron-to-chromium@1.4.758: + electron-to-chromium@1.4.783: resolution: { - integrity: sha512-/o9x6TCdrYZBMdGeTifAP3wlF/gVT+TtWJe3BSmtNh92Mw81U9hrYwW9OAGUh+sEOX/yz5e34sksqRruZbjYrw==, + integrity: sha512-bT0jEz/Xz1fahQpbZ1D7LgmPYZ3iHVY39NcWWro1+hA2IvjiPeaXtfSqrQ+nXjApMvQRE2ASt1itSLRrebHMRQ==, } end-of-stream@1.4.4: @@ -1939,6 +2814,13 @@ packages: integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==, } + esutils@2.0.3: + resolution: + { + integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==, + } + engines: { node: ">=0.10.0" } + execa@4.1.0: resolution: { @@ -1959,10 +2841,10 @@ packages: } engines: { node: ^12.20 || >= 14.13 } - fill-range@7.0.1: + fill-range@7.1.1: resolution: { - integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==, + integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==, } engines: { node: ">=8" } @@ -2139,10 +3021,10 @@ packages: engines: { node: ">=12" } hasBin: true - i18next@23.11.3: + i18next@23.11.5: resolution: { - integrity: sha512-Pq/aSKowir7JM0rj+Wa23Kb6KKDUGno/HjG+wRQu0PxoTbpQ4N89MAT0rFGvXmLkRLNMb1BbBOKGozl01dabzg==, + integrity: sha512-41pvpVbW9rhZPk5xjCX2TPJi2861LEig/YRhUkY+1FQ2IQPS0bKUDYnEqY8XPPbB48h1uIwLnP9iiEfuSl20CA==, } ignore@5.3.1: @@ -2152,10 +3034,10 @@ packages: } engines: { node: ">= 4" } - immutable@4.3.5: + immutable@4.3.6: resolution: { - integrity: sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==, + integrity: sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==, } import-fresh@3.3.0: @@ -2287,6 +3169,13 @@ packages: } hasBin: true + jsesc@0.5.0: + resolution: + { + integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==, + } + hasBin: true + jsesc@2.5.2: resolution: { @@ -2340,6 +3229,12 @@ packages: integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==, } + lodash.debounce@4.0.8: + resolution: + { + integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==, + } + lodash@4.17.21: resolution: { @@ -2371,10 +3266,10 @@ packages: integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==, } - mdast-util-from-markdown@2.0.0: + mdast-util-from-markdown@2.0.1: resolution: { - integrity: sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==, + integrity: sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==, } mdast-util-mdx-expression@2.0.0: @@ -2822,10 +3717,10 @@ packages: } engines: { node: ">=8" } - picocolors@1.0.0: + picocolors@1.0.1: resolution: { - integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==, + integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==, } picomatch@2.3.1: @@ -2914,10 +3809,10 @@ packages: integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==, } - react-hook-form@7.51.4: + react-hook-form@7.51.5: resolution: { - integrity: sha512-V14i8SEkh+V1gs6YtD0hdHYnoL4tp/HX/A45wWQN15CYr9bFRmmRdYStSO5L65lCCZRF+kYiSKhm9alqbcdiVA==, + integrity: sha512-J2ILT5gWx1XUIJRETiA7M19iXHlG74+6O3KApzvqB/w8S5NQR7AbU8HVZrMALdmDgWpRPYiZJl0zx8Z4L2mP6Q==, } engines: { node: ">=12.22.0" } peerDependencies: @@ -2967,20 +3862,20 @@ packages: } engines: { node: ">=0.10.0" } - react-router-dom@6.23.0: + react-router-dom@6.23.1: resolution: { - integrity: sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==, + integrity: sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==, } engines: { node: ">=14.0.0" } peerDependencies: react: ">=16.8" react-dom: ">=16.8" - react-router@6.23.0: + react-router@6.23.1: resolution: { - integrity: sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==, + integrity: sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==, } engines: { node: ">=14.0.0" } peerDependencies: @@ -2995,10 +3890,10 @@ packages: react: ">=16.6.0" react-dom: ">=16.6.0" - react-virtuoso@4.7.10: + react-virtuoso@4.7.11: resolution: { - integrity: sha512-l+fnBf/G1Fp6pHCnhFq2Ra4lkZtT6c5XrS9rCS0OA6de7WGLZviCo0y61CUZZG79TeAw3L7O4czeNPiqh9CIrg==, + integrity: sha512-Kdn9qEtQI2ulEuBMzW2BTkDsfijB05QUd6lpZ1K36oyA3k65Cz4lG4EKrh2pCfUafX4C2uMSZOwzMOhbrMOTFA==, } engines: { node: ">=10" } peerDependencies: @@ -3034,12 +3929,45 @@ packages: react-native: optional: true + regenerate-unicode-properties@10.1.1: + resolution: + { + integrity: sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==, + } + engines: { node: ">=4" } + + regenerate@1.4.2: + resolution: + { + integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==, + } + regenerator-runtime@0.14.1: resolution: { integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==, } + regenerator-transform@0.15.2: + resolution: + { + integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==, + } + + regexpu-core@5.3.2: + resolution: + { + integrity: sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==, + } + engines: { node: ">=4" } + + regjsparser@0.9.1: + resolution: + { + integrity: sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==, + } + hasBin: true + remark-parse@11.0.0: resolution: { @@ -3078,18 +4006,18 @@ packages: } hasBin: true - rollup@4.17.2: + rollup@4.18.0: resolution: { - integrity: sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==, + integrity: sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==, } engines: { node: ">=18.0.0", npm: ">=8.0.0" } hasBin: true - sass@1.77.0: + sass@1.77.2: resolution: { - integrity: sha512-eGj4HNfXqBWtSnvItNkn7B6icqH14i3CiCGbzMKs3BAPTq62pp9NBYsBgyN4cA+qssqo9r26lW4JSvlaUUWbgw==, + integrity: sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==, } engines: { node: ">=14.0.0" } hasBin: true @@ -3292,6 +4220,34 @@ packages: } engines: { node: ">=14.0" } + unicode-canonical-property-names-ecmascript@2.0.0: + resolution: + { + integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==, + } + engines: { node: ">=4" } + + unicode-match-property-ecmascript@2.0.0: + resolution: + { + integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==, + } + engines: { node: ">=4" } + + unicode-match-property-value-ecmascript@2.1.0: + resolution: + { + integrity: sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==, + } + engines: { node: ">=4" } + + unicode-property-aliases-ecmascript@2.1.0: + resolution: + { + integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==, + } + engines: { node: ">=4" } + unified@11.0.4: resolution: { @@ -3347,10 +4303,10 @@ packages: } engines: { node: ">= 10.0.0" } - update-browserslist-db@1.0.15: + update-browserslist-db@1.0.16: resolution: { - integrity: sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==, + integrity: sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==, } hasBin: true peerDependencies: @@ -3539,25 +4495,25 @@ snapshots: "@jridgewell/gen-mapping": 0.3.5 "@jridgewell/trace-mapping": 0.3.25 - "@babel/code-frame@7.24.2": + "@babel/code-frame@7.24.6": dependencies: - "@babel/highlight": 7.24.5 - picocolors: 1.0.0 + "@babel/highlight": 7.24.6 + picocolors: 1.0.1 - "@babel/compat-data@7.24.4": {} + "@babel/compat-data@7.24.6": {} - "@babel/core@7.24.5": + "@babel/core@7.24.6": dependencies: "@ampproject/remapping": 2.3.0 - "@babel/code-frame": 7.24.2 - "@babel/generator": 7.24.5 - "@babel/helper-compilation-targets": 7.23.6 - "@babel/helper-module-transforms": 7.24.5(@babel/core@7.24.5) - "@babel/helpers": 7.24.5 - "@babel/parser": 7.24.5 - "@babel/template": 7.24.0 - "@babel/traverse": 7.24.5 - "@babel/types": 7.24.5 + "@babel/code-frame": 7.24.6 + "@babel/generator": 7.24.6 + "@babel/helper-compilation-targets": 7.24.6 + "@babel/helper-module-transforms": 7.24.6(@babel/core@7.24.6) + "@babel/helpers": 7.24.6 + "@babel/parser": 7.24.6 + "@babel/template": 7.24.6 + "@babel/traverse": 7.24.6 + "@babel/types": 7.24.6 convert-source-map: 2.0.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -3566,119 +4522,755 @@ snapshots: transitivePeerDependencies: - supports-color - "@babel/generator@7.24.5": + "@babel/generator@7.24.6": dependencies: - "@babel/types": 7.24.5 + "@babel/types": 7.24.6 "@jridgewell/gen-mapping": 0.3.5 "@jridgewell/trace-mapping": 0.3.25 jsesc: 2.5.2 - "@babel/helper-compilation-targets@7.23.6": + "@babel/helper-annotate-as-pure@7.24.6": dependencies: - "@babel/compat-data": 7.24.4 - "@babel/helper-validator-option": 7.23.5 + "@babel/types": 7.24.6 + + "@babel/helper-builder-binary-assignment-operator-visitor@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-compilation-targets@7.24.6": + dependencies: + "@babel/compat-data": 7.24.6 + "@babel/helper-validator-option": 7.24.6 browserslist: 4.23.0 lru-cache: 5.1.1 semver: 6.3.1 - "@babel/helper-environment-visitor@7.22.20": {} - - "@babel/helper-function-name@7.23.0": + "@babel/helper-create-class-features-plugin@7.24.6(@babel/core@7.24.6)": dependencies: - "@babel/template": 7.24.0 - "@babel/types": 7.24.5 + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-function-name": 7.24.6 + "@babel/helper-member-expression-to-functions": 7.24.6 + "@babel/helper-optimise-call-expression": 7.24.6 + "@babel/helper-replace-supers": 7.24.6(@babel/core@7.24.6) + "@babel/helper-skip-transparent-expression-wrappers": 7.24.6 + "@babel/helper-split-export-declaration": 7.24.6 + semver: 6.3.1 - "@babel/helper-hoist-variables@7.22.5": + "@babel/helper-create-regexp-features-plugin@7.24.6(@babel/core@7.24.6)": dependencies: - "@babel/types": 7.24.5 + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + regexpu-core: 5.3.2 + semver: 6.3.1 - "@babel/helper-module-imports@7.24.3": + "@babel/helper-define-polyfill-provider@0.6.2(@babel/core@7.24.6)": dependencies: - "@babel/types": 7.24.5 - - "@babel/helper-module-transforms@7.24.5(@babel/core@7.24.5)": - dependencies: - "@babel/core": 7.24.5 - "@babel/helper-environment-visitor": 7.22.20 - "@babel/helper-module-imports": 7.24.3 - "@babel/helper-simple-access": 7.24.5 - "@babel/helper-split-export-declaration": 7.24.5 - "@babel/helper-validator-identifier": 7.24.5 - - "@babel/helper-plugin-utils@7.24.5": {} - - "@babel/helper-simple-access@7.24.5": - dependencies: - "@babel/types": 7.24.5 - - "@babel/helper-split-export-declaration@7.24.5": - dependencies: - "@babel/types": 7.24.5 - - "@babel/helper-string-parser@7.24.1": {} - - "@babel/helper-validator-identifier@7.24.5": {} - - "@babel/helper-validator-option@7.23.5": {} - - "@babel/helpers@7.24.5": - dependencies: - "@babel/template": 7.24.0 - "@babel/traverse": 7.24.5 - "@babel/types": 7.24.5 + "@babel/core": 7.24.6 + "@babel/helper-compilation-targets": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + debug: 4.3.4 + lodash.debounce: 4.0.8 + resolve: 1.22.8 transitivePeerDependencies: - supports-color - "@babel/highlight@7.24.5": + "@babel/helper-environment-visitor@7.24.6": {} + + "@babel/helper-function-name@7.24.6": dependencies: - "@babel/helper-validator-identifier": 7.24.5 + "@babel/template": 7.24.6 + "@babel/types": 7.24.6 + + "@babel/helper-hoist-variables@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-member-expression-to-functions@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-module-imports@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-module-transforms@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-module-imports": 7.24.6 + "@babel/helper-simple-access": 7.24.6 + "@babel/helper-split-export-declaration": 7.24.6 + "@babel/helper-validator-identifier": 7.24.6 + + "@babel/helper-optimise-call-expression@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-plugin-utils@7.24.6": {} + + "@babel/helper-remap-async-to-generator@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-wrap-function": 7.24.6 + + "@babel/helper-replace-supers@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-member-expression-to-functions": 7.24.6 + "@babel/helper-optimise-call-expression": 7.24.6 + + "@babel/helper-simple-access@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-skip-transparent-expression-wrappers@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-split-export-declaration@7.24.6": + dependencies: + "@babel/types": 7.24.6 + + "@babel/helper-string-parser@7.24.6": {} + + "@babel/helper-validator-identifier@7.24.6": {} + + "@babel/helper-validator-option@7.24.6": {} + + "@babel/helper-wrap-function@7.24.6": + dependencies: + "@babel/helper-function-name": 7.24.6 + "@babel/template": 7.24.6 + "@babel/types": 7.24.6 + + "@babel/helpers@7.24.6": + dependencies: + "@babel/template": 7.24.6 + "@babel/types": 7.24.6 + + "@babel/highlight@7.24.6": + dependencies: + "@babel/helper-validator-identifier": 7.24.6 chalk: 2.4.2 js-tokens: 4.0.0 - picocolors: 1.0.0 + picocolors: 1.0.1 - "@babel/parser@7.24.5": + "@babel/parser@7.24.6": dependencies: - "@babel/types": 7.24.5 + "@babel/types": 7.24.6 - "@babel/plugin-transform-react-jsx-self@7.24.5(@babel/core@7.24.5)": + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.24.6(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 - "@babel/helper-plugin-utils": 7.24.5 + "@babel/core": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 - "@babel/plugin-transform-react-jsx-source@7.24.1(@babel/core@7.24.5)": + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.24.6(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 - "@babel/helper-plugin-utils": 7.24.5 + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 - "@babel/runtime@7.24.5": + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": 7.24.6 + "@babel/plugin-transform-optional-chaining": 7.24.6(@babel/core@7.24.6) + + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + + "@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-import-assertions@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-import-attributes@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-jsx@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-typescript@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-regexp-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-arrow-functions@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-async-generator-functions@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-remap-async-to-generator": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-syntax-async-generators": 7.8.4(@babel/core@7.24.6) + + "@babel/plugin-transform-async-to-generator@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-module-imports": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-remap-async-to-generator": 7.24.6(@babel/core@7.24.6) + + "@babel/plugin-transform-block-scoped-functions@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-block-scoping@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-class-properties@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-class-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-class-static-block@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-class-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-class-static-block": 7.14.5(@babel/core@7.24.6) + + "@babel/plugin-transform-classes@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-compilation-targets": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-function-name": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-replace-supers": 7.24.6(@babel/core@7.24.6) + "@babel/helper-split-export-declaration": 7.24.6 + globals: 11.12.0 + + "@babel/plugin-transform-computed-properties@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/template": 7.24.6 + + "@babel/plugin-transform-destructuring@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-dotall-regex@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-regexp-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-duplicate-keys@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-dynamic-import@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-dynamic-import": 7.8.3(@babel/core@7.24.6) + + "@babel/plugin-transform-exponentiation-operator@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-builder-binary-assignment-operator-visitor": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-export-namespace-from@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-export-namespace-from": 7.8.3(@babel/core@7.24.6) + + "@babel/plugin-transform-for-of@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": 7.24.6 + + "@babel/plugin-transform-function-name@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-compilation-targets": 7.24.6 + "@babel/helper-function-name": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-json-strings@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-json-strings": 7.8.3(@babel/core@7.24.6) + + "@babel/plugin-transform-literals@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-logical-assignment-operators@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-logical-assignment-operators": 7.10.4(@babel/core@7.24.6) + + "@babel/plugin-transform-member-expression-literals@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-modules-amd@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-module-transforms": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-modules-commonjs@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-module-transforms": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-simple-access": 7.24.6 + + "@babel/plugin-transform-modules-systemjs@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-hoist-variables": 7.24.6 + "@babel/helper-module-transforms": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-validator-identifier": 7.24.6 + + "@babel/plugin-transform-modules-umd@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-module-transforms": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-named-capturing-groups-regex@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-regexp-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-new-target@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-nullish-coalescing-operator@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3(@babel/core@7.24.6) + + "@babel/plugin-transform-numeric-separator@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-numeric-separator": 7.10.4(@babel/core@7.24.6) + + "@babel/plugin-transform-object-rest-spread@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-compilation-targets": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-object-rest-spread": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-transform-parameters": 7.24.6(@babel/core@7.24.6) + + "@babel/plugin-transform-object-super@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-replace-supers": 7.24.6(@babel/core@7.24.6) + + "@babel/plugin-transform-optional-catch-binding@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-optional-catch-binding": 7.8.3(@babel/core@7.24.6) + + "@babel/plugin-transform-optional-chaining@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": 7.24.6 + "@babel/plugin-syntax-optional-chaining": 7.8.3(@babel/core@7.24.6) + + "@babel/plugin-transform-parameters@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-private-methods@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-class-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-private-property-in-object@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-create-class-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-private-property-in-object": 7.14.5(@babel/core@7.24.6) + + "@babel/plugin-transform-property-literals@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-react-display-name@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-react-jsx-development@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/plugin-transform-react-jsx": 7.24.6(@babel/core@7.24.6) + + "@babel/plugin-transform-react-jsx-self@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-react-jsx-source@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-react-jsx@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-module-imports": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-jsx": 7.24.6(@babel/core@7.24.6) + "@babel/types": 7.24.6 + + "@babel/plugin-transform-react-pure-annotations@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-regenerator@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + regenerator-transform: 0.15.2 + + "@babel/plugin-transform-reserved-words@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-shorthand-properties@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-spread@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": 7.24.6 + + "@babel/plugin-transform-sticky-regex@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-template-literals@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-typeof-symbol@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-typescript@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-annotate-as-pure": 7.24.6 + "@babel/helper-create-class-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + "@babel/plugin-syntax-typescript": 7.24.6(@babel/core@7.24.6) + + "@babel/plugin-transform-unicode-escapes@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-unicode-property-regex@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-regexp-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-unicode-regex@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-regexp-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/plugin-transform-unicode-sets-regex@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-create-regexp-features-plugin": 7.24.6(@babel/core@7.24.6) + "@babel/helper-plugin-utils": 7.24.6 + + "@babel/preset-env@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/compat-data": 7.24.6 + "@babel/core": 7.24.6 + "@babel/helper-compilation-targets": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-validator-option": 7.24.6 + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.6) + "@babel/plugin-syntax-async-generators": 7.8.4(@babel/core@7.24.6) + "@babel/plugin-syntax-class-properties": 7.12.13(@babel/core@7.24.6) + "@babel/plugin-syntax-class-static-block": 7.14.5(@babel/core@7.24.6) + "@babel/plugin-syntax-dynamic-import": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-export-namespace-from": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-import-assertions": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-syntax-import-attributes": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-syntax-import-meta": 7.10.4(@babel/core@7.24.6) + "@babel/plugin-syntax-json-strings": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-logical-assignment-operators": 7.10.4(@babel/core@7.24.6) + "@babel/plugin-syntax-nullish-coalescing-operator": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-numeric-separator": 7.10.4(@babel/core@7.24.6) + "@babel/plugin-syntax-object-rest-spread": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-optional-catch-binding": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-optional-chaining": 7.8.3(@babel/core@7.24.6) + "@babel/plugin-syntax-private-property-in-object": 7.14.5(@babel/core@7.24.6) + "@babel/plugin-syntax-top-level-await": 7.14.5(@babel/core@7.24.6) + "@babel/plugin-syntax-unicode-sets-regex": 7.18.6(@babel/core@7.24.6) + "@babel/plugin-transform-arrow-functions": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-async-generator-functions": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-async-to-generator": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-block-scoped-functions": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-block-scoping": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-class-properties": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-class-static-block": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-classes": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-computed-properties": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-destructuring": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-dotall-regex": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-duplicate-keys": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-dynamic-import": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-exponentiation-operator": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-export-namespace-from": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-for-of": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-function-name": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-json-strings": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-literals": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-logical-assignment-operators": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-member-expression-literals": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-modules-amd": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-modules-commonjs": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-modules-systemjs": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-modules-umd": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-named-capturing-groups-regex": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-new-target": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-nullish-coalescing-operator": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-numeric-separator": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-object-rest-spread": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-object-super": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-optional-catch-binding": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-optional-chaining": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-parameters": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-private-methods": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-private-property-in-object": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-property-literals": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-regenerator": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-reserved-words": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-shorthand-properties": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-spread": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-sticky-regex": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-template-literals": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-typeof-symbol": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-unicode-escapes": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-unicode-property-regex": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-unicode-regex": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-unicode-sets-regex": 7.24.6(@babel/core@7.24.6) + "@babel/preset-modules": 0.1.6-no-external-plugins(@babel/core@7.24.6) + babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.24.6) + babel-plugin-polyfill-corejs3: 0.10.4(@babel/core@7.24.6) + babel-plugin-polyfill-regenerator: 0.6.2(@babel/core@7.24.6) + core-js-compat: 3.37.1 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + "@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/types": 7.24.6 + esutils: 2.0.3 + + "@babel/preset-react@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-validator-option": 7.24.6 + "@babel/plugin-transform-react-display-name": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-react-jsx": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-react-jsx-development": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-react-pure-annotations": 7.24.6(@babel/core@7.24.6) + + "@babel/preset-typescript@7.24.6(@babel/core@7.24.6)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-plugin-utils": 7.24.6 + "@babel/helper-validator-option": 7.24.6 + "@babel/plugin-syntax-jsx": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-modules-commonjs": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-typescript": 7.24.6(@babel/core@7.24.6) + + "@babel/regjsgen@0.8.0": {} + + "@babel/runtime@7.24.6": dependencies: regenerator-runtime: 0.14.1 - "@babel/template@7.24.0": + "@babel/template@7.24.6": dependencies: - "@babel/code-frame": 7.24.2 - "@babel/parser": 7.24.5 - "@babel/types": 7.24.5 + "@babel/code-frame": 7.24.6 + "@babel/parser": 7.24.6 + "@babel/types": 7.24.6 - "@babel/traverse@7.24.5": + "@babel/traverse@7.24.6": dependencies: - "@babel/code-frame": 7.24.2 - "@babel/generator": 7.24.5 - "@babel/helper-environment-visitor": 7.22.20 - "@babel/helper-function-name": 7.23.0 - "@babel/helper-hoist-variables": 7.22.5 - "@babel/helper-split-export-declaration": 7.24.5 - "@babel/parser": 7.24.5 - "@babel/types": 7.24.5 + "@babel/code-frame": 7.24.6 + "@babel/generator": 7.24.6 + "@babel/helper-environment-visitor": 7.24.6 + "@babel/helper-function-name": 7.24.6 + "@babel/helper-hoist-variables": 7.24.6 + "@babel/helper-split-export-declaration": 7.24.6 + "@babel/parser": 7.24.6 + "@babel/types": 7.24.6 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color - "@babel/types@7.24.5": + "@babel/types@7.24.6": dependencies: - "@babel/helper-string-parser": 7.24.1 - "@babel/helper-validator-identifier": 7.24.5 + "@babel/helper-string-parser": 7.24.6 + "@babel/helper-validator-identifier": 7.24.6 to-fast-properties: 2.0.0 "@dnd-kit/accessibility@3.1.0(react@18.3.1)": @@ -3708,8 +5300,8 @@ snapshots: "@emotion/babel-plugin@11.11.0": dependencies: - "@babel/helper-module-imports": 7.24.3 - "@babel/runtime": 7.24.5 + "@babel/helper-module-imports": 7.24.6 + "@babel/runtime": 7.24.6 "@emotion/hash": 0.9.1 "@emotion/memoize": 0.8.1 "@emotion/serialize": 1.1.4 @@ -3736,9 +5328,9 @@ snapshots: "@emotion/memoize@0.8.1": {} - "@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1)": + "@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 "@emotion/babel-plugin": 11.11.0 "@emotion/cache": 11.11.0 "@emotion/serialize": 1.1.4 @@ -3748,7 +5340,7 @@ snapshots: hoist-non-react-statics: 3.3.2 react: 18.3.1 optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 "@emotion/serialize@1.1.4": dependencies: @@ -3760,18 +5352,18 @@ snapshots: "@emotion/sheet@1.2.2": {} - "@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)": + "@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 "@emotion/babel-plugin": 11.11.0 "@emotion/is-prop-valid": 1.2.2 - "@emotion/react": 11.11.4(@types/react@18.3.1)(react@18.3.1) + "@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1) "@emotion/serialize": 1.1.4 "@emotion/use-insertion-effect-with-fallbacks": 1.0.1(react@18.3.1) "@emotion/utils": 1.2.1 react: 18.3.1 optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 "@emotion/unitless@0.8.1": {} @@ -3854,16 +5446,16 @@ snapshots: "@fastify/busboy@2.1.1": {} - "@floating-ui/core@1.6.1": + "@floating-ui/core@1.6.2": dependencies: "@floating-ui/utils": 0.2.2 "@floating-ui/dom@1.6.5": dependencies: - "@floating-ui/core": 1.6.1 + "@floating-ui/core": 1.6.2 "@floating-ui/utils": 0.2.2 - "@floating-ui/react-dom@2.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@floating-ui/react-dom@2.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: "@floating-ui/dom": 1.6.5 react: 18.3.1 @@ -3890,70 +5482,70 @@ snapshots: "@juggle/resize-observer@3.4.0": {} - "@mui/base@5.0.0-beta.20(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@floating-ui/react-dom": 2.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/types": 7.2.14(@types/react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@floating-ui/react-dom": 2.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/types": 7.2.14(@types/react@18.3.3) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) "@popperjs/core": 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@mui/base@5.0.0-beta.40(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@mui/base@5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@floating-ui/react-dom": 2.0.9(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/types": 7.2.14(@types/react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@floating-ui/react-dom": 2.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/types": 7.2.14(@types/react@18.3.3) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) "@popperjs/core": 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@mui/core-downloads-tracker@5.15.16": {} + "@mui/core-downloads-tracker@5.15.18": {} - "@mui/icons-material@5.15.16(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)": + "@mui/icons-material@5.15.18(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@mui/material": 5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@babel/runtime": 7.24.6 + "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@mui/lab@5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@mui/lab@5.0.0-alpha.149(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@mui/base": 5.0.0-beta.20(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/material": 5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@mui/types": 7.2.14(@types/react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) - "@mui/x-tree-view": 6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@babel/runtime": 7.24.6 + "@mui/base": 5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@mui/types": 7.2.14(@types/react@18.3.3) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) + "@mui/x-tree-view": 6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) optionalDependencies: - "@emotion/react": 11.11.4(@types/react@18.3.1)(react@18.3.1) - "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@types/react": 18.3.1 + "@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1) + "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@types/react": 18.3.3 - "@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@mui/base": 5.0.0-beta.40(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/core-downloads-tracker": 5.15.16 - "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@mui/types": 7.2.14(@types/react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@mui/base": 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/core-downloads-tracker": 5.15.18 + "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@mui/types": 7.2.14(@types/react@18.3.3) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) "@types/react-transition-group": 4.4.10 clsx: 2.1.1 csstype: 3.1.3 @@ -3963,66 +5555,66 @@ snapshots: react-is: 18.3.1 react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) optionalDependencies: - "@emotion/react": 11.11.4(@types/react@18.3.1)(react@18.3.1) - "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@types/react": 18.3.1 + "@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1) + "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@types/react": 18.3.3 - "@mui/private-theming@5.15.14(@types/react@18.3.1)(react@18.3.1)": + "@mui/private-theming@5.15.14(@types/react@18.3.3)(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@mui/styled-engine@5.15.14(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(react@18.3.1)": + "@mui/styled-engine@5.15.14(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 "@emotion/cache": 11.11.0 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 optionalDependencies: - "@emotion/react": 11.11.4(@types/react@18.3.1)(react@18.3.1) - "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) + "@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1) + "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - "@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1)": + "@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@mui/private-theming": 5.15.14(@types/react@18.3.1)(react@18.3.1) - "@mui/styled-engine": 5.15.14(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(react@18.3.1) - "@mui/types": 7.2.14(@types/react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@mui/private-theming": 5.15.14(@types/react@18.3.3)(react@18.3.1) + "@mui/styled-engine": 5.15.14(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) + "@mui/types": 7.2.14(@types/react@18.3.3) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 react: 18.3.1 optionalDependencies: - "@emotion/react": 11.11.4(@types/react@18.3.1)(react@18.3.1) - "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@types/react": 18.3.1 + "@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1) + "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@types/react": 18.3.3 - "@mui/types@7.2.14(@types/react@18.3.1)": + "@mui/types@7.2.14(@types/react@18.3.3)": optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@mui/utils@5.15.14(@types/react@18.3.1)(react@18.3.1)": + "@mui/utils@5.15.14(@types/react@18.3.3)(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 "@types/prop-types": 15.7.12 prop-types: 15.8.1 react: 18.3.1 react-is: 18.3.1 optionalDependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@mui/x-data-grid@6.19.11(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@mui/x-data-grid@6.20.0(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@mui/material": 5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 @@ -4031,15 +5623,15 @@ snapshots: transitivePeerDependencies: - "@types/react" - "@mui/x-tree-view@6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": + "@mui/x-tree-view@6.0.0-alpha.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/material@5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": dependencies: - "@babel/runtime": 7.24.5 - "@emotion/react": 11.11.4(@types/react@18.3.1)(react@18.3.1) - "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@mui/base": 5.0.0-beta.20(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/material": 5.15.16(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1))(@types/react@18.3.1)(react@18.3.1) - "@mui/utils": 5.15.14(@types/react@18.3.1)(react@18.3.1) + "@babel/runtime": 7.24.6 + "@emotion/react": 11.11.4(@types/react@18.3.3)(react@18.3.1) + "@emotion/styled": 11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@mui/base": 5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/material": 5.15.18(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + "@mui/system": 5.15.15(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + "@mui/utils": 5.15.14(@types/react@18.3.3)(react@18.3.1) "@types/react-transition-group": 4.4.10 clsx: 2.1.1 prop-types: 15.8.1 @@ -4115,112 +5707,121 @@ snapshots: "@popperjs/core@2.11.8": {} - "@remix-run/router@1.16.0": {} + "@remix-run/router@1.16.1": {} - "@rollup/pluginutils@5.1.0(rollup@4.17.2)": + "@rollup/plugin-babel@6.0.4(@babel/core@7.24.6)(@types/babel__core@7.20.5)(rollup@4.18.0)": + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-module-imports": 7.24.6 + "@rollup/pluginutils": 5.1.0(rollup@4.18.0) + optionalDependencies: + "@types/babel__core": 7.20.5 + rollup: 4.18.0 + + "@rollup/pluginutils@5.1.0(rollup@4.18.0)": dependencies: "@types/estree": 1.0.5 estree-walker: 2.0.2 picomatch: 2.3.1 optionalDependencies: - rollup: 4.17.2 + rollup: 4.18.0 - "@rollup/rollup-android-arm-eabi@4.17.2": + "@rollup/rollup-android-arm-eabi@4.18.0": optional: true - "@rollup/rollup-android-arm64@4.17.2": + "@rollup/rollup-android-arm64@4.18.0": optional: true - "@rollup/rollup-darwin-arm64@4.17.2": + "@rollup/rollup-darwin-arm64@4.18.0": optional: true - "@rollup/rollup-darwin-x64@4.17.2": + "@rollup/rollup-darwin-x64@4.18.0": optional: true - "@rollup/rollup-linux-arm-gnueabihf@4.17.2": + "@rollup/rollup-linux-arm-gnueabihf@4.18.0": optional: true - "@rollup/rollup-linux-arm-musleabihf@4.17.2": + "@rollup/rollup-linux-arm-musleabihf@4.18.0": optional: true - "@rollup/rollup-linux-arm64-gnu@4.17.2": + "@rollup/rollup-linux-arm64-gnu@4.18.0": optional: true - "@rollup/rollup-linux-arm64-musl@4.17.2": + "@rollup/rollup-linux-arm64-musl@4.18.0": optional: true - "@rollup/rollup-linux-powerpc64le-gnu@4.17.2": + "@rollup/rollup-linux-powerpc64le-gnu@4.18.0": optional: true - "@rollup/rollup-linux-riscv64-gnu@4.17.2": + "@rollup/rollup-linux-riscv64-gnu@4.18.0": optional: true - "@rollup/rollup-linux-s390x-gnu@4.17.2": + "@rollup/rollup-linux-s390x-gnu@4.18.0": optional: true - "@rollup/rollup-linux-x64-gnu@4.17.2": + "@rollup/rollup-linux-x64-gnu@4.18.0": optional: true - "@rollup/rollup-linux-x64-musl@4.17.2": + "@rollup/rollup-linux-x64-musl@4.18.0": optional: true - "@rollup/rollup-win32-arm64-msvc@4.17.2": + "@rollup/rollup-win32-arm64-msvc@4.18.0": optional: true - "@rollup/rollup-win32-ia32-msvc@4.17.2": + "@rollup/rollup-win32-ia32-msvc@4.18.0": optional: true - "@rollup/rollup-win32-x64-msvc@4.17.2": + "@rollup/rollup-win32-x64-msvc@4.18.0": optional: true - "@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-add-jsx-attribute@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-remove-jsx-attribute@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-remove-jsx-empty-expression@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-replace-jsx-attribute-value@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-svg-dynamic-title@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-svg-em-dimensions@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-transform-react-native-svg@8.1.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.24.5)": + "@svgr/babel-plugin-transform-svg-component@8.0.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 + "@babel/core": 7.24.6 - "@svgr/babel-preset@8.1.0(@babel/core@7.24.5)": + "@svgr/babel-preset@8.1.0(@babel/core@7.24.6)": dependencies: - "@babel/core": 7.24.5 - "@svgr/babel-plugin-add-jsx-attribute": 8.0.0(@babel/core@7.24.5) - "@svgr/babel-plugin-remove-jsx-attribute": 8.0.0(@babel/core@7.24.5) - "@svgr/babel-plugin-remove-jsx-empty-expression": 8.0.0(@babel/core@7.24.5) - "@svgr/babel-plugin-replace-jsx-attribute-value": 8.0.0(@babel/core@7.24.5) - "@svgr/babel-plugin-svg-dynamic-title": 8.0.0(@babel/core@7.24.5) - "@svgr/babel-plugin-svg-em-dimensions": 8.0.0(@babel/core@7.24.5) - "@svgr/babel-plugin-transform-react-native-svg": 8.1.0(@babel/core@7.24.5) - "@svgr/babel-plugin-transform-svg-component": 8.0.0(@babel/core@7.24.5) + "@babel/core": 7.24.6 + "@svgr/babel-plugin-add-jsx-attribute": 8.0.0(@babel/core@7.24.6) + "@svgr/babel-plugin-remove-jsx-attribute": 8.0.0(@babel/core@7.24.6) + "@svgr/babel-plugin-remove-jsx-empty-expression": 8.0.0(@babel/core@7.24.6) + "@svgr/babel-plugin-replace-jsx-attribute-value": 8.0.0(@babel/core@7.24.6) + "@svgr/babel-plugin-svg-dynamic-title": 8.0.0(@babel/core@7.24.6) + "@svgr/babel-plugin-svg-em-dimensions": 8.0.0(@babel/core@7.24.6) + "@svgr/babel-plugin-transform-react-native-svg": 8.1.0(@babel/core@7.24.6) + "@svgr/babel-plugin-transform-svg-component": 8.0.0(@babel/core@7.24.6) "@svgr/core@8.1.0(typescript@5.4.5)": dependencies: - "@babel/core": 7.24.5 - "@svgr/babel-preset": 8.1.0(@babel/core@7.24.5) + "@babel/core": 7.24.6 + "@svgr/babel-preset": 8.1.0(@babel/core@7.24.6) camelcase: 6.3.0 cosmiconfig: 8.3.6(typescript@5.4.5) snake-case: 3.0.4 @@ -4230,84 +5831,84 @@ snapshots: "@svgr/hast-util-to-babel-ast@8.0.0": dependencies: - "@babel/types": 7.24.5 + "@babel/types": 7.24.6 entities: 4.5.0 "@svgr/plugin-jsx@8.1.0(@svgr/core@8.1.0(typescript@5.4.5))": dependencies: - "@babel/core": 7.24.5 - "@svgr/babel-preset": 8.1.0(@babel/core@7.24.5) + "@babel/core": 7.24.6 + "@svgr/babel-preset": 8.1.0(@babel/core@7.24.6) "@svgr/core": 8.1.0(typescript@5.4.5) "@svgr/hast-util-to-babel-ast": 8.0.0 svg-parser: 2.0.4 transitivePeerDependencies: - supports-color - "@tauri-apps/api@1.5.4": {} + "@tauri-apps/api@1.5.6": {} - "@tauri-apps/cli-darwin-arm64@1.5.13": + "@tauri-apps/cli-darwin-arm64@1.5.14": optional: true - "@tauri-apps/cli-darwin-x64@1.5.13": + "@tauri-apps/cli-darwin-x64@1.5.14": optional: true - "@tauri-apps/cli-linux-arm-gnueabihf@1.5.13": + "@tauri-apps/cli-linux-arm-gnueabihf@1.5.14": optional: true - "@tauri-apps/cli-linux-arm64-gnu@1.5.13": + "@tauri-apps/cli-linux-arm64-gnu@1.5.14": optional: true - "@tauri-apps/cli-linux-arm64-musl@1.5.13": + "@tauri-apps/cli-linux-arm64-musl@1.5.14": optional: true - "@tauri-apps/cli-linux-x64-gnu@1.5.13": + "@tauri-apps/cli-linux-x64-gnu@1.5.14": optional: true - "@tauri-apps/cli-linux-x64-musl@1.5.13": + "@tauri-apps/cli-linux-x64-musl@1.5.14": optional: true - "@tauri-apps/cli-win32-arm64-msvc@1.5.13": + "@tauri-apps/cli-win32-arm64-msvc@1.5.14": optional: true - "@tauri-apps/cli-win32-ia32-msvc@1.5.13": + "@tauri-apps/cli-win32-ia32-msvc@1.5.14": optional: true - "@tauri-apps/cli-win32-x64-msvc@1.5.13": + "@tauri-apps/cli-win32-x64-msvc@1.5.14": optional: true - "@tauri-apps/cli@1.5.13": + "@tauri-apps/cli@1.5.14": optionalDependencies: - "@tauri-apps/cli-darwin-arm64": 1.5.13 - "@tauri-apps/cli-darwin-x64": 1.5.13 - "@tauri-apps/cli-linux-arm-gnueabihf": 1.5.13 - "@tauri-apps/cli-linux-arm64-gnu": 1.5.13 - "@tauri-apps/cli-linux-arm64-musl": 1.5.13 - "@tauri-apps/cli-linux-x64-gnu": 1.5.13 - "@tauri-apps/cli-linux-x64-musl": 1.5.13 - "@tauri-apps/cli-win32-arm64-msvc": 1.5.13 - "@tauri-apps/cli-win32-ia32-msvc": 1.5.13 - "@tauri-apps/cli-win32-x64-msvc": 1.5.13 + "@tauri-apps/cli-darwin-arm64": 1.5.14 + "@tauri-apps/cli-darwin-x64": 1.5.14 + "@tauri-apps/cli-linux-arm-gnueabihf": 1.5.14 + "@tauri-apps/cli-linux-arm64-gnu": 1.5.14 + "@tauri-apps/cli-linux-arm64-musl": 1.5.14 + "@tauri-apps/cli-linux-x64-gnu": 1.5.14 + "@tauri-apps/cli-linux-x64-musl": 1.5.14 + "@tauri-apps/cli-win32-arm64-msvc": 1.5.14 + "@tauri-apps/cli-win32-ia32-msvc": 1.5.14 + "@tauri-apps/cli-win32-x64-msvc": 1.5.14 "@types/babel__core@7.20.5": dependencies: - "@babel/parser": 7.24.5 - "@babel/types": 7.24.5 + "@babel/parser": 7.24.6 + "@babel/types": 7.24.6 "@types/babel__generator": 7.6.8 "@types/babel__template": 7.4.4 - "@types/babel__traverse": 7.20.5 + "@types/babel__traverse": 7.20.6 "@types/babel__generator@7.6.8": dependencies: - "@babel/types": 7.24.5 + "@babel/types": 7.24.6 "@types/babel__template@7.4.4": dependencies: - "@babel/parser": 7.24.5 - "@babel/types": 7.24.5 + "@babel/parser": 7.24.6 + "@babel/types": 7.24.6 - "@types/babel__traverse@7.20.5": + "@types/babel__traverse@7.20.6": dependencies: - "@babel/types": 7.24.5 + "@babel/types": 7.24.6 "@types/debug@4.1.12": dependencies: @@ -4321,7 +5922,7 @@ snapshots: "@types/fs-extra@9.0.13": dependencies: - "@types/node": 20.12.10 + "@types/node": 20.12.12 "@types/hast@3.0.4": dependencies: @@ -4333,17 +5934,17 @@ snapshots: "@types/lodash-es@4.17.12": dependencies: - "@types/lodash": 4.17.1 + "@types/lodash": 4.17.4 - "@types/lodash@4.17.1": {} + "@types/lodash@4.17.4": {} - "@types/mdast@4.0.3": + "@types/mdast@4.0.4": dependencies: "@types/unist": 3.0.2 "@types/ms@0.7.34": {} - "@types/node@20.12.10": + "@types/node@20.12.12": dependencies: undici-types: 5.26.5 @@ -4353,13 +5954,13 @@ snapshots: "@types/react-dom@18.3.0": dependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 "@types/react-transition-group@4.4.10": dependencies: - "@types/react": 18.3.1 + "@types/react": 18.3.3 - "@types/react@18.3.1": + "@types/react@18.3.3": dependencies: "@types/prop-types": 15.7.12 csstype: 3.1.3 @@ -4370,14 +5971,14 @@ snapshots: "@ungap/structured-clone@1.2.0": {} - "@vitejs/plugin-react@4.2.1(vite@5.2.11(@types/node@20.12.10)(sass@1.77.0))": + "@vitejs/plugin-react@4.3.0(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2))": dependencies: - "@babel/core": 7.24.5 - "@babel/plugin-transform-react-jsx-self": 7.24.5(@babel/core@7.24.5) - "@babel/plugin-transform-react-jsx-source": 7.24.1(@babel/core@7.24.5) + "@babel/core": 7.24.6 + "@babel/plugin-transform-react-jsx-self": 7.24.6(@babel/core@7.24.6) + "@babel/plugin-transform-react-jsx-source": 7.24.6(@babel/core@7.24.6) "@types/babel__core": 7.20.5 react-refresh: 0.14.2 - vite: 5.2.11(@types/node@20.12.10)(sass@1.77.0) + vite: 5.2.11(@types/node@20.12.12)(sass@1.77.2) transitivePeerDependencies: - supports-color @@ -4389,9 +5990,9 @@ snapshots: transitivePeerDependencies: - supports-color - ahooks@3.7.11(react@18.3.1): + ahooks@3.8.0(react@18.3.1): dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 dayjs: 1.11.5 intersection-observer: 0.12.2 js-cookie: 2.2.1 @@ -4415,7 +6016,7 @@ snapshots: asynckit@0.4.0: {} - axios@1.6.8: + axios@1.7.2: dependencies: follow-redirects: 1.15.6 form-data: 4.0.0 @@ -4425,32 +6026,56 @@ snapshots: babel-plugin-macros@3.1.0: dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 cosmiconfig: 7.1.0 resolve: 1.22.8 + babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.24.6): + dependencies: + "@babel/compat-data": 7.24.6 + "@babel/core": 7.24.6 + "@babel/helper-define-polyfill-provider": 0.6.2(@babel/core@7.24.6) + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + + babel-plugin-polyfill-corejs3@0.10.4(@babel/core@7.24.6): + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-define-polyfill-provider": 0.6.2(@babel/core@7.24.6) + core-js-compat: 3.37.1 + transitivePeerDependencies: + - supports-color + + babel-plugin-polyfill-regenerator@0.6.2(@babel/core@7.24.6): + dependencies: + "@babel/core": 7.24.6 + "@babel/helper-define-polyfill-provider": 0.6.2(@babel/core@7.24.6) + transitivePeerDependencies: + - supports-color + bail@2.0.2: {} before-after-hook@2.2.3: {} binary-extensions@2.3.0: {} - braces@3.0.2: + braces@3.0.3: dependencies: - fill-range: 7.0.1 + fill-range: 7.1.1 browserslist@4.23.0: dependencies: - caniuse-lite: 1.0.30001616 - electron-to-chromium: 1.4.758 + caniuse-lite: 1.0.30001623 + electron-to-chromium: 1.4.783 node-releases: 2.0.14 - update-browserslist-db: 1.0.15(browserslist@4.23.0) + update-browserslist-db: 1.0.16(browserslist@4.23.0) callsites@3.1.0: {} camelcase@6.3.0: {} - caniuse-lite@1.0.30001616: {} + caniuse-lite@1.0.30001623: {} ccount@2.0.1: {} @@ -4471,7 +6096,7 @@ snapshots: chokidar@3.6.0: dependencies: anymatch: 3.1.3 - braces: 3.0.2 + braces: 3.0.3 glob-parent: 5.1.2 is-binary-path: 2.1.0 is-glob: 4.0.3 @@ -4500,6 +6125,10 @@ snapshots: convert-source-map@2.0.0: {} + core-js-compat@3.37.1: + dependencies: + browserslist: 4.23.0 + cosmiconfig@7.1.0: dependencies: "@types/parse-json": 4.0.2 @@ -4553,7 +6182,7 @@ snapshots: dom-helpers@5.2.1: dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 csstype: 3.1.3 dot-case@3.0.4: @@ -4561,7 +6190,7 @@ snapshots: no-case: 3.0.4 tslib: 2.6.2 - electron-to-chromium@1.4.758: {} + electron-to-chromium@1.4.783: {} end-of-stream@1.4.4: dependencies: @@ -4609,6 +6238,8 @@ snapshots: estree-walker@2.0.2: {} + esutils@2.0.3: {} + execa@4.1.0: dependencies: cross-spawn: 7.0.3 @@ -4628,7 +6259,7 @@ snapshots: node-domexception: 1.0.0 web-streams-polyfill: 3.3.3 - fill-range@7.0.1: + fill-range@7.1.1: dependencies: to-regex-range: 5.0.1 @@ -4733,13 +6364,13 @@ snapshots: husky@7.0.4: {} - i18next@23.11.3: + i18next@23.11.5: dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 ignore@5.3.1: {} - immutable@4.3.5: {} + immutable@4.3.6: {} import-fresh@3.3.0: dependencies: @@ -4795,6 +6426,8 @@ snapshots: dependencies: argparse: 2.0.1 + jsesc@0.5.0: {} + jsesc@2.5.2: {} json-parse-even-better-errors@2.3.1: {} @@ -4817,6 +6450,8 @@ snapshots: lodash-es@4.17.21: {} + lodash.debounce@4.0.8: {} + lodash@4.17.21: {} longest-streak@3.1.0: {} @@ -4833,9 +6468,9 @@ snapshots: dependencies: yallist: 3.1.1 - mdast-util-from-markdown@2.0.0: + mdast-util-from-markdown@2.0.1: dependencies: - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 "@types/unist": 3.0.2 decode-named-character-reference: 1.0.2 devlop: 1.1.0 @@ -4854,9 +6489,9 @@ snapshots: dependencies: "@types/estree-jsx": 1.0.5 "@types/hast": 3.0.4 - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.0 + mdast-util-from-markdown: 2.0.1 mdast-util-to-markdown: 2.1.0 transitivePeerDependencies: - supports-color @@ -4865,11 +6500,11 @@ snapshots: dependencies: "@types/estree-jsx": 1.0.5 "@types/hast": 3.0.4 - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 "@types/unist": 3.0.2 ccount: 2.0.1 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.0 + mdast-util-from-markdown: 2.0.1 mdast-util-to-markdown: 2.1.0 parse-entities: 4.0.1 stringify-entities: 4.0.4 @@ -4883,22 +6518,22 @@ snapshots: dependencies: "@types/estree-jsx": 1.0.5 "@types/hast": 3.0.4 - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.0 + mdast-util-from-markdown: 2.0.1 mdast-util-to-markdown: 2.1.0 transitivePeerDependencies: - supports-color mdast-util-phrasing@4.1.0: dependencies: - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 unist-util-is: 6.0.0 mdast-util-to-hast@13.1.0: dependencies: "@types/hast": 3.0.4 - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 "@ungap/structured-clone": 1.2.0 devlop: 1.1.0 micromark-util-sanitize-uri: 2.0.0 @@ -4909,7 +6544,7 @@ snapshots: mdast-util-to-markdown@2.1.0: dependencies: - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 "@types/unist": 3.0.2 longest-streak: 3.1.0 mdast-util-phrasing: 4.1.0 @@ -4920,7 +6555,7 @@ snapshots: mdast-util-to-string@4.0.0: dependencies: - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 merge-stream@2.0.0: {} @@ -5184,7 +6819,7 @@ snapshots: parse-json@5.2.0: dependencies: - "@babel/code-frame": 7.24.2 + "@babel/code-frame": 7.24.6 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -5199,7 +6834,7 @@ snapshots: path-type@4.0.0: {} - picocolors@1.0.0: {} + picocolors@1.0.1: {} picomatch@2.3.1: {} @@ -5208,7 +6843,7 @@ snapshots: postcss@8.4.38: dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 + picocolors: 1.0.1 source-map-js: 1.2.0 prettier@2.8.8: {} @@ -5219,7 +6854,7 @@ snapshots: find-up: 4.1.0 ignore: 5.3.1 mri: 1.2.0 - picocolors: 1.0.0 + picocolors: 1.0.1 picomatch: 3.0.1 prettier: 2.8.8 tslib: 2.6.2 @@ -5247,20 +6882,20 @@ snapshots: react-error-boundary@3.1.4(react@18.3.1): dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 react: 18.3.1 react-fast-compare@3.2.2: {} - react-hook-form@7.51.4(react@18.3.1): + react-hook-form@7.51.5(react@18.3.1): dependencies: react: 18.3.1 - react-i18next@13.5.0(i18next@23.11.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-i18next@13.5.0(i18next@23.11.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 html-parse-stringify: 3.0.1 - i18next: 23.11.3 + i18next: 23.11.5 react: 18.3.1 optionalDependencies: react-dom: 18.3.1(react@18.3.1) @@ -5269,10 +6904,10 @@ snapshots: react-is@18.3.1: {} - react-markdown@9.0.1(@types/react@18.3.1)(react@18.3.1): + react-markdown@9.0.1(@types/react@18.3.3)(react@18.3.1): dependencies: "@types/hast": 3.0.4 - "@types/react": 18.3.1 + "@types/react": 18.3.3 devlop: 1.1.0 hast-util-to-jsx-runtime: 2.3.0 html-url-attributes: 3.0.0 @@ -5288,28 +6923,28 @@ snapshots: react-refresh@0.14.2: {} - react-router-dom@6.23.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-router-dom@6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - "@remix-run/router": 1.16.0 + "@remix-run/router": 1.16.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-router: 6.23.0(react@18.3.1) + react-router: 6.23.1(react@18.3.1) - react-router@6.23.0(react@18.3.1): + react-router@6.23.1(react@18.3.1): dependencies: - "@remix-run/router": 1.16.0 + "@remix-run/router": 1.16.1 react: 18.3.1 react-transition-group@4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - "@babel/runtime": 7.24.5 + "@babel/runtime": 7.24.6 dom-helpers: 5.2.1 loose-envify: 1.4.0 prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - react-virtuoso@4.7.10(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-virtuoso@4.7.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: react: 18.3.1 react-dom: 18.3.1(react@18.3.1) @@ -5329,12 +6964,35 @@ snapshots: optionalDependencies: react-dom: 18.3.1(react@18.3.1) + regenerate-unicode-properties@10.1.1: + dependencies: + regenerate: 1.4.2 + + regenerate@1.4.2: {} + regenerator-runtime@0.14.1: {} + regenerator-transform@0.15.2: + dependencies: + "@babel/runtime": 7.24.6 + + regexpu-core@5.3.2: + dependencies: + "@babel/regjsgen": 0.8.0 + regenerate: 1.4.2 + regenerate-unicode-properties: 10.1.1 + regjsparser: 0.9.1 + unicode-match-property-ecmascript: 2.0.0 + unicode-match-property-value-ecmascript: 2.1.0 + + regjsparser@0.9.1: + dependencies: + jsesc: 0.5.0 + remark-parse@11.0.0: dependencies: - "@types/mdast": 4.0.3 - mdast-util-from-markdown: 2.0.0 + "@types/mdast": 4.0.4 + mdast-util-from-markdown: 2.0.1 micromark-util-types: 2.0.0 unified: 11.0.4 transitivePeerDependencies: @@ -5343,7 +7001,7 @@ snapshots: remark-rehype@11.1.0: dependencies: "@types/hast": 3.0.4 - "@types/mdast": 4.0.3 + "@types/mdast": 4.0.4 mdast-util-to-hast: 13.1.0 unified: 11.0.4 vfile: 6.0.1 @@ -5360,32 +7018,32 @@ snapshots: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - rollup@4.17.2: + rollup@4.18.0: dependencies: "@types/estree": 1.0.5 optionalDependencies: - "@rollup/rollup-android-arm-eabi": 4.17.2 - "@rollup/rollup-android-arm64": 4.17.2 - "@rollup/rollup-darwin-arm64": 4.17.2 - "@rollup/rollup-darwin-x64": 4.17.2 - "@rollup/rollup-linux-arm-gnueabihf": 4.17.2 - "@rollup/rollup-linux-arm-musleabihf": 4.17.2 - "@rollup/rollup-linux-arm64-gnu": 4.17.2 - "@rollup/rollup-linux-arm64-musl": 4.17.2 - "@rollup/rollup-linux-powerpc64le-gnu": 4.17.2 - "@rollup/rollup-linux-riscv64-gnu": 4.17.2 - "@rollup/rollup-linux-s390x-gnu": 4.17.2 - "@rollup/rollup-linux-x64-gnu": 4.17.2 - "@rollup/rollup-linux-x64-musl": 4.17.2 - "@rollup/rollup-win32-arm64-msvc": 4.17.2 - "@rollup/rollup-win32-ia32-msvc": 4.17.2 - "@rollup/rollup-win32-x64-msvc": 4.17.2 + "@rollup/rollup-android-arm-eabi": 4.18.0 + "@rollup/rollup-android-arm64": 4.18.0 + "@rollup/rollup-darwin-arm64": 4.18.0 + "@rollup/rollup-darwin-x64": 4.18.0 + "@rollup/rollup-linux-arm-gnueabihf": 4.18.0 + "@rollup/rollup-linux-arm-musleabihf": 4.18.0 + "@rollup/rollup-linux-arm64-gnu": 4.18.0 + "@rollup/rollup-linux-arm64-musl": 4.18.0 + "@rollup/rollup-linux-powerpc64le-gnu": 4.18.0 + "@rollup/rollup-linux-riscv64-gnu": 4.18.0 + "@rollup/rollup-linux-s390x-gnu": 4.18.0 + "@rollup/rollup-linux-x64-gnu": 4.18.0 + "@rollup/rollup-linux-x64-musl": 4.18.0 + "@rollup/rollup-win32-arm64-msvc": 4.18.0 + "@rollup/rollup-win32-ia32-msvc": 4.18.0 + "@rollup/rollup-win32-x64-msvc": 4.18.0 fsevents: 2.3.3 - sass@1.77.0: + sass@1.77.2: dependencies: chokidar: 3.6.0 - immutable: 4.3.5 + immutable: 4.3.6 source-map-js: 1.2.0 scheduler@0.23.2: @@ -5475,6 +7133,17 @@ snapshots: dependencies: "@fastify/busboy": 2.1.1 + unicode-canonical-property-names-ecmascript@2.0.0: {} + + unicode-match-property-ecmascript@2.0.0: + dependencies: + unicode-canonical-property-names-ecmascript: 2.0.0 + unicode-property-aliases-ecmascript: 2.1.0 + + unicode-match-property-value-ecmascript@2.1.0: {} + + unicode-property-aliases-ecmascript@2.1.0: {} + unified@11.0.4: dependencies: "@types/unist": 3.0.2 @@ -5517,11 +7186,11 @@ snapshots: universalify@2.0.1: {} - update-browserslist-db@1.0.15(browserslist@4.23.0): + update-browserslist-db@1.0.16(browserslist@4.23.0): dependencies: browserslist: 4.23.0 escalade: 3.1.2 - picocolors: 1.0.0 + picocolors: 1.0.1 vfile-message@4.0.2: dependencies: @@ -5538,26 +7207,26 @@ snapshots: dependencies: monaco-editor: 0.47.0 - vite-plugin-svgr@4.2.0(rollup@4.17.2)(typescript@5.4.5)(vite@5.2.11(@types/node@20.12.10)(sass@1.77.0)): + vite-plugin-svgr@4.2.0(rollup@4.18.0)(typescript@5.4.5)(vite@5.2.11(@types/node@20.12.12)(sass@1.77.2)): dependencies: - "@rollup/pluginutils": 5.1.0(rollup@4.17.2) + "@rollup/pluginutils": 5.1.0(rollup@4.18.0) "@svgr/core": 8.1.0(typescript@5.4.5) "@svgr/plugin-jsx": 8.1.0(@svgr/core@8.1.0(typescript@5.4.5)) - vite: 5.2.11(@types/node@20.12.10)(sass@1.77.0) + vite: 5.2.11(@types/node@20.12.12)(sass@1.77.2) transitivePeerDependencies: - rollup - supports-color - typescript - vite@5.2.11(@types/node@20.12.10)(sass@1.77.0): + vite@5.2.11(@types/node@20.12.12)(sass@1.77.2): dependencies: esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.17.2 + rollup: 4.18.0 optionalDependencies: - "@types/node": 20.12.10 + "@types/node": 20.12.12 fsevents: 2.3.3 - sass: 1.77.0 + sass: 1.77.2 void-elements@3.1.0: {} diff --git a/clash-verge-rev/vite.config.ts b/clash-verge-rev/vite.config.ts index e533d4c939..bda3ec230e 100644 --- a/clash-verge-rev/vite.config.ts +++ b/clash-verge-rev/vite.config.ts @@ -2,15 +2,26 @@ import { defineConfig } from "vite"; import path from "path"; import svgr from "vite-plugin-svgr"; import react from "@vitejs/plugin-react"; +import { babel } from "@rollup/plugin-babel"; import monacoEditor from "vite-plugin-monaco-editor"; -// https://vitejs.dev/config/ export default defineConfig({ root: "src", server: { port: 3000 }, plugins: [ svgr(), react(), + { + apply: "build", // apply only for build, not for serve + ...babel({ + babelHelpers: "bundled", + extensions: [".js", ".jsx", ".ts", ".tsx"], + targets: { + edge: "109", // last version to support Windows 7 + safari: "13", // macOS 10.15 Catalina + }, + }), + }, monacoEditor({ languageWorkers: ["editorWorkerService", "typescript", "css"], customWorkers: [ diff --git a/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts b/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts new file mode 100755 index 0000000000..7560d405bd --- /dev/null +++ b/lede/target/linux/ramips/dts/mt7621_openfi_5pro.dts @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "mt7621.dtsi" + +#include +#include +#include + +/ { + compatible = "openfi,5pro", "mediatek,mt7621-soc"; + model = "OpenFi 5Pro"; + + aliases { + led-boot = &led_system_blue; + led-failsafe = &led_system_blue; + led-running = &led_system_blue; + led-upgrade = &led_system_blue; + }; + + chosen { + bootargs = "console=ttyS0,115200"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps { + label = "wps"; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_system_blue: led-0 { + label = "blue:system"; + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio 14 GPIO_ACTIVE_LOW>; + }; + + led_internet_blue: led-1 { + label = "blue:internet"; + color = ; + function = LED_FUNCTION_STATUS; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + + led_wifi_blue: led-2 { + label = "blue:wifi"; + color = ; + linux,default-trigger = "phy0tpt"; + gpios = <&gpio 16 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <45000000>; + broken-flash-reset; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "bootloader"; + reg = <0x0 0x30000>; + read-only; + }; + + partition@30000 { + label = "config"; + reg = <0x30000 0x10000>; + read-only; + }; + + factory: partition@40000 { + label = "factory"; + reg = <0x40000 0x10000>; + read-only; + }; + + partition@50000 { + compatible = "denx,uimage"; + label = "firmware"; + reg = <0x50000 0x3f00000>; + }; + }; + }; +}; + +&pcie { + status = "okay"; +}; + +&pcie0 { + mt76@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x0>; + ieee80211-freq-limit = <2400000 2500000>; + }; +}; + +&pcie1 { + wifi1: mt76@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 6000000>; + }; +}; + +&gmac0 { + mtd-mac-address = <&factory 0xe000>; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "wan"; + mtd-mac-address = <&factory 0xe006>; + }; + + port@1 { + status = "okay"; + label = "lan"; + }; + }; +}; + +&state_default { + gpio { + groups = "wdt", "i2c", "jtag"; + function = "gpio"; + }; +}; diff --git a/lede/target/linux/ramips/image/mt7621.mk b/lede/target/linux/ramips/image/mt7621.mk index 9f40936fca..8c7d937659 100644 --- a/lede/target/linux/ramips/image/mt7621.mk +++ b/lede/target/linux/ramips/image/mt7621.mk @@ -1401,6 +1401,15 @@ define Device/netis_wf2881 endef TARGET_DEVICES += netis_wf2881 +define Device/openfi_5pro + $(Device/dsa-migration) + IMAGE_SIZE := 63448k + DEVICE_VENDOR := OpenFi + DEVICE_MODEL := 5Pro + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7663-firmware-ap kmod-usb3 +endef +TARGET_DEVICES += openfi_5pro + define Device/oraybox_x3a $(Device/dsa-migration) $(Device/uimage-lzma-loader) diff --git a/lede/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/lede/target/linux/ramips/mt7621/base-files/etc/board.d/02_network old mode 100644 new mode 100755 index 96c0c9d16d..165278271c --- a/lede/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/lede/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -30,6 +30,7 @@ ramips_setup_interfaces() ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan" ;; asiarf,ap7621-001|\ + openfi,5pro|\ winstars,ws-wn583a6) ucidef_set_interfaces_lan_wan "lan" "wan" ;; diff --git a/mihomo/constant/features/version_windows.go b/mihomo/constant/features/version_windows.go index 192df950fe..2f75618835 100644 --- a/mihomo/constant/features/version_windows.go +++ b/mihomo/constant/features/version_windows.go @@ -6,5 +6,5 @@ func init() { version := windows.RtlGetVersion() WindowsMajorVersion = version.MajorVersion WindowsMinorVersion = version.MinorVersion - WindowsBuildNumber = version.MinorVersion + WindowsBuildNumber = version.BuildNumber } diff --git a/sing-box/docs/changelog.md b/sing-box/docs/changelog.md index 24819fbfcc..7181277110 100644 --- a/sing-box/docs/changelog.md +++ b/sing-box/docs/changelog.md @@ -6,7 +6,7 @@ icon: material/alert-decagram * Add tailing comma support in JSON configuration * Add simple auto redirect for Android **1** -* Add bittorrent sniffer **2** +* Add BitTorrent sniffer **2** **1**: @@ -20,8 +20,6 @@ See [Redirect](/configuration/inbound/redirect/). **2**: -It doesn't exactly work right now. Do not use it for anything other than blocking bittorrent traffics. - See [Protocol Sniff](/configuration/route/sniff/). ### 1.9.0 diff --git a/sing-box/docs/configuration/inbound/redirect.md b/sing-box/docs/configuration/inbound/redirect.md index 67f33ff85d..e0c5caf299 100644 --- a/sing-box/docs/configuration/inbound/redirect.md +++ b/sing-box/docs/configuration/inbound/redirect.md @@ -2,7 +2,7 @@ icon: material/new-box --- -!!! quote "Changes in sing-box 1.9.0" +!!! quote "Changes in sing-box 1.10.0" :material-plus: [auto_redirect](#auto_redirect) diff --git a/sing-box/experimental/libbox/config.go b/sing-box/experimental/libbox/config.go index b7731143cb..4af9699426 100644 --- a/sing-box/experimental/libbox/config.go +++ b/sing-box/experimental/libbox/config.go @@ -9,6 +9,7 @@ import ( "github.com/sagernet/sing-box" "github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/common/process" + "github.com/sagernet/sing-box/experimental/libbox/platform" "github.com/sagernet/sing-box/option" "github.com/sagernet/sing-tun" "github.com/sagernet/sing/common/control" @@ -97,6 +98,14 @@ func (s *platformInterfaceStub) FindProcessInfo(ctx context.Context, network str return nil, os.ErrInvalid } +func (s *platformInterfaceStub) PerAppProxyList() ([]uint32, error) { + return nil, os.ErrInvalid +} + +func (s *platformInterfaceStub) PerAppProxyMode() int32 { + return platform.PerAppProxyModeDisabled +} + type interfaceMonitorStub struct{} func (s *interfaceMonitorStub) Start() error { diff --git a/sing-box/experimental/libbox/platform.go b/sing-box/experimental/libbox/platform.go index 4078140f8c..3afa839e15 100644 --- a/sing-box/experimental/libbox/platform.go +++ b/sing-box/experimental/libbox/platform.go @@ -22,6 +22,8 @@ type PlatformInterface interface { IncludeAllNetworks() bool ReadWIFIState() *WIFIState ClearDNSCache() + PerAppProxyList() (IntegerIterator, error) + PerAppProxyMode() int32 } type TunInterface interface { @@ -54,6 +56,11 @@ type NetworkInterfaceIterator interface { HasNext() bool } +type IntegerIterator interface { + Next() int32 + HasNext() bool +} + type OnDemandRule interface { Target() int32 DNSSearchDomainMatch() StringIterator diff --git a/sing-box/experimental/libbox/platform/interface.go b/sing-box/experimental/libbox/platform/interface.go index 3bec13fa5b..7513678180 100644 --- a/sing-box/experimental/libbox/platform/interface.go +++ b/sing-box/experimental/libbox/platform/interface.go @@ -11,6 +11,12 @@ import ( "github.com/sagernet/sing/common/logger" ) +const ( + PerAppProxyModeDisabled int32 = iota + PerAppProxyModeExclude + PerAppProxyModeInclude +) + type Interface interface { Initialize(ctx context.Context, router adapter.Router) error UsePlatformAutoDetectInterfaceControl() bool @@ -24,5 +30,7 @@ type Interface interface { IncludeAllNetworks() bool ClearDNSCache() ReadWIFIState() adapter.WIFIState + PerAppProxyList() ([]uint32, error) + PerAppProxyMode() int32 process.Searcher } diff --git a/sing-box/experimental/libbox/service.go b/sing-box/experimental/libbox/service.go index 0a54d7abd8..299945ba45 100644 --- a/sing-box/experimental/libbox/service.go +++ b/sing-box/experimental/libbox/service.go @@ -229,6 +229,18 @@ func (w *platformInterfaceWrapper) ReadWIFIState() adapter.WIFIState { return (adapter.WIFIState)(*wifiState) } +func (w *platformInterfaceWrapper) PerAppProxyList() ([]uint32, error) { + uidIterator, err := w.iif.PerAppProxyList() + if err != nil { + return nil, err + } + return common.Map(iteratorToArray[int32](uidIterator), func(it int32) uint32 { return uint32(it) }), nil +} + +func (w *platformInterfaceWrapper) PerAppProxyMode() int32 { + return w.iif.PerAppProxyMode() +} + func (w *platformInterfaceWrapper) DisableColors() bool { return runtime.GOOS != "android" } diff --git a/sing-box/inbound/builder.go b/sing-box/inbound/builder.go index 201ab800f3..e1909b84e2 100644 --- a/sing-box/inbound/builder.go +++ b/sing-box/inbound/builder.go @@ -19,7 +19,7 @@ func New(ctx context.Context, router adapter.Router, logger log.ContextLogger, o case C.TypeTun: return NewTun(ctx, router, logger, options.Tag, options.TunOptions, platformInterface) case C.TypeRedirect: - return NewRedirect(ctx, router, logger, options.Tag, options.RedirectOptions) + return NewRedirect(ctx, router, logger, options.Tag, options.RedirectOptions, platformInterface) case C.TypeTProxy: return NewTProxy(ctx, router, logger, options.Tag, options.TProxyOptions), nil case C.TypeDirect: diff --git a/sing-box/inbound/redirect.go b/sing-box/inbound/redirect.go index 9b79fa1c6e..bf0da9be63 100644 --- a/sing-box/inbound/redirect.go +++ b/sing-box/inbound/redirect.go @@ -7,11 +7,13 @@ import ( "net/netip" "os" "os/exec" + "sort" "strings" "github.com/sagernet/sing-box/adapter" "github.com/sagernet/sing-box/common/redir" C "github.com/sagernet/sing-box/constant" + "github.com/sagernet/sing-box/experimental/libbox/platform" "github.com/sagernet/sing-box/log" "github.com/sagernet/sing-box/option" "github.com/sagernet/sing/common" @@ -24,12 +26,13 @@ import ( type Redirect struct { myInboundAdapter - autoRedirect option.AutoRedirectOptions - needSu bool - suPath string + platformInterface platform.Interface + autoRedirect option.AutoRedirectOptions + needSu bool + suPath string } -func NewRedirect(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.RedirectInboundOptions) (*Redirect, error) { +func NewRedirect(ctx context.Context, router adapter.Router, logger log.ContextLogger, tag string, options option.RedirectInboundOptions, platformInterface platform.Interface) (*Redirect, error) { redirect := &Redirect{ myInboundAdapter: myInboundAdapter{ protocol: C.TypeRedirect, @@ -40,7 +43,8 @@ func NewRedirect(ctx context.Context, router adapter.Router, logger log.ContextL tag: tag, listenOptions: options.ListenOptions, }, - autoRedirect: common.PtrValueOrDefault(options.AutoRedirect), + platformInterface: platformInterface, + autoRedirect: common.PtrValueOrDefault(options.AutoRedirect), } if redirect.autoRedirect.Enabled { if !C.IsAndroid { @@ -101,21 +105,73 @@ func (r *Redirect) Close() error { } func (r *Redirect) setupRedirect() error { - myUid := os.Getuid() - tcpPort := M.AddrPortFromNet(r.tcpListener.Addr()).Port() - interfaceRules := common.FlatMap(r.router.(adapter.Router).InterfaceFinder().Interfaces(), func(it control.Interface) []string { - return common.Map(common.Filter(it.Addresses, func(it netip.Prefix) bool { return it.Addr().Is4() }), func(it netip.Prefix) string { - return "iptables -t nat -A sing-box -p tcp -j RETURN -d " + it.String() - }) - }) - return r.runAndroidShell(` + tableName := "sing-box" + rules := ` set -e -o pipefail iptables -t nat -N sing-box -` + strings.Join(interfaceRules, "\n") + ` -iptables -t nat -A sing-box -j RETURN -m owner --uid-owner ` + F.ToString(myUid) + ` -iptables -t nat -A sing-box -p tcp -j REDIRECT --to-ports ` + F.ToString(tcpPort) + ` -iptables -t nat -A OUTPUT -p tcp -j sing-box -`) +` + rules += strings.Join(common.FlatMap(r.router.(adapter.Router).InterfaceFinder().Interfaces(), func(it control.Interface) []string { + return common.Map(common.Filter(it.Addresses, func(it netip.Prefix) bool { return it.Addr().Is4() }), func(it netip.Prefix) string { + return "iptables -t nat -A " + tableName + " -p tcp -j RETURN -d " + it.String() + }) + }), "\n") + var ( + myUid = uint32(os.Getuid()) + perAppProxyList []uint32 + perAppProxyMap = make(map[uint32]bool) + perAppProxyMode int32 + err error + ) + if r.platformInterface != nil { + perAppProxyMode = r.platformInterface.PerAppProxyMode() + if perAppProxyMode != platform.PerAppProxyModeDisabled { + perAppProxyList, err = r.platformInterface.PerAppProxyList() + if err != nil { + return E.Cause(err, "read per app proxy configuration") + } + } + for _, proxyUID := range perAppProxyList { + perAppProxyMap[proxyUID] = true + } + } + excludeUser := func(userID uint32) { + if perAppProxyMode != platform.PerAppProxyModeInclude { + perAppProxyMap[userID] = false + } else { + delete(perAppProxyMap, userID) + } + } + excludeUser(myUid) + if myUid != 0 && myUid != 2000 { + excludeUser(0) + } + perAppProxyList = perAppProxyList[:0] + for uid := range perAppProxyMap { + perAppProxyList = append(perAppProxyList, uid) + } + sort.SliceStable(perAppProxyList, func(i, j int) bool { + return perAppProxyList[i] < perAppProxyList[j] + }) + redirectPortStr := F.ToString(M.AddrPortFromNet(r.tcpListener.Addr()).Port()) + if perAppProxyMode != platform.PerAppProxyModeInclude { + rules += "\n" + strings.Join(common.Map(perAppProxyList, func(it uint32) string { + return "iptables -t nat -A " + tableName + " -j RETURN -m owner --uid-owner " + F.ToString(it) + }), "\n") + rules += "\niptables -t nat -A " + tableName + " -p tcp -j REDIRECT --to-ports " + redirectPortStr + } else { + rules += "\n" + strings.Join(common.Map(perAppProxyList, func(it uint32) string { + return "iptables -t nat -A " + tableName + " -p tcp -j REDIRECT --to-ports " + redirectPortStr + " -m owner --uid-owner " + F.ToString(it) + }), "\n") + } + rules += "\niptables -t nat -A OUTPUT -p tcp -j " + tableName + for _, ruleLine := range strings.Split(rules, "\n") { + ruleLine = strings.TrimSpace(ruleLine) + if ruleLine == "" { + continue + } + r.logger.Debug("# ", ruleLine) + } + return r.runAndroidShell(rules) } func (r *Redirect) cleanupRedirect() { diff --git a/suyu/MIGRATION.md b/suyu/MIGRATION.md index 425e301136..3963b5004f 100644 --- a/suyu/MIGRATION.md +++ b/suyu/MIGRATION.md @@ -1,3 +1,7 @@ + # Migrating from yuzu When coming from yuzu, the migration is as easy as renaming some directories. diff --git a/v2rayu/Podfile.lock b/v2rayu/Podfile.lock index fddbb8a4b3..e4582471ed 100644 --- a/v2rayu/Podfile.lock +++ b/v2rayu/Podfile.lock @@ -60,4 +60,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3e6393519555a41d4672846cccbb38ef2c16f21f -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/v2rayu/V2rayU.xcodeproj/project.pbxproj b/v2rayu/V2rayU.xcodeproj/project.pbxproj index 68b5db18ff..bb027d4a82 100755 --- a/v2rayu/V2rayU.xcodeproj/project.pbxproj +++ b/v2rayu/V2rayU.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -756,7 +756,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -815,7 +815,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; @@ -833,12 +833,13 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 4.1.0; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = RJYEH6TCJD; + DEVELOPMENT_TEAM = ""; ENABLE_ONLY_ACTIVE_RESOURCES = YES; INFOPLIST_FILE = V2rayU/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = V2rayU; @@ -846,7 +847,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 4.1.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU; @@ -855,7 +856,7 @@ SKIP_INSTALL = NO; SWIFT_OBJC_BRIDGING_HEADER = "Common/V2rayU-Bridging-header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -866,12 +867,13 @@ ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 4.1.0; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = RJYEH6TCJD; + DEVELOPMENT_TEAM = ""; ENABLE_ONLY_ACTIVE_RESOURCES = YES; INFOPLIST_FILE = V2rayU/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = V2rayU; @@ -879,7 +881,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 4.1.0; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = net.yanue.V2rayU; @@ -888,7 +890,7 @@ SKIP_INSTALL = NO; SWIFT_OBJC_BRIDGING_HEADER = "Common/V2rayU-Bridging-header.h"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -899,9 +901,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = RJYEH6TCJD; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; @@ -914,9 +916,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = RJYEH6TCJD; + DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; }; diff --git a/v2rayu/V2rayU/Ping.swift b/v2rayu/V2rayU/Ping.swift index a4a300514c..29bc78022b 100644 --- a/v2rayu/V2rayU/Ping.swift +++ b/v2rayu/V2rayU/Ping.swift @@ -18,9 +18,7 @@ let second: Double = 1000000 let pingURL = URL(string: "http://www.gstatic.com/generate_204")! class PingSpeed: NSObject { - let lock = NSLock() let semaphore = DispatchSemaphore(value: 30) // work pool - var group = DispatchGroup() func pingAll() { NSLog("ping start") @@ -28,6 +26,7 @@ class PingSpeed: NSObject { NSLog("ping inPing") return } + // make sure core file V2rayLaunch.checkV2rayCore() // in ping @@ -51,26 +50,47 @@ class PingSpeed: NSObject { DispatchQueue.main.async { menuController.setStatusMenuTip(pingTip: pingTip) } - let thread = Thread{ - self.runTask(items: itemList) - } - thread.start() - } - - func runTask(items: [V2rayItem]) { - self.group = DispatchGroup() - let pingQueue = DispatchQueue(label: "pingQueue", qos: .background, attributes: .concurrent) - for item in items { - self.group.enter() // 进入DispatchGroup - pingQueue.async { - // 信号量,限制最大并发 - self.semaphore.wait() - // run ping by async queue - self.pingEachServer(item: item) + Task { + do { + try await pingTaskGroup(items: itemList) + } catch let error { + NSLog("pingTaskGroup error: \(error)") } } - self.group.wait() // 等待所有任务完成 - print("All tasks finished") + } + + func pingTaskGroup(items: [V2rayItem]) async throws { + await withThrowingTaskGroup(of: Int.self) { group in + for item in items { + group.addTask { + do { + await self.semaphore.wait() + defer { + self.semaphore.signal() + } + try await self.pingEachServer(item: item) + } catch let error { + NSLog("pingEachServer error: \(error)") + } + return 1 + } + } + } + print("pingTaskGroup end") + self.pingEnd() + } + + func pingEachServer(item: V2rayItem) async throws { + NSLog("ping \(item.name) - \(item.remark)") + if !item.isValid { + return + } + // ping + let t = PingServer(item: item) + try await t.doPing() + } + + func pingEnd() { inPing = false let langStr = Locale.current.languageCode var pingTip: String = "" @@ -79,33 +99,14 @@ class PingSpeed: NSObject { } else { pingTip = "Ping" } + print("pingTaskGroup pingEnd", pingTip) DispatchQueue.main.async { menuController.setStatusMenuTip(pingTip: pingTip) - } - DispatchQueue.main.async { menuController.showServers() } // kill killAllPing() } - - func pingEachServer(item: V2rayItem) { - NSLog("ping \(item.name) - \(item.remark)") - if !item.isValid { - // refresh servers - ping.pingEnd(item: item) - return - } - // ping - PingServer(item: item).doPing() - } - - func pingEnd(item: V2rayItem) { - lock.lock() - self.semaphore.signal() // 释放信号量 - self.group.leave() // 离开DispatchGroup - lock.unlock() - } } class PingServer: NSObject, URLSessionDataDelegate { @@ -120,7 +121,7 @@ class PingServer: NSObject, URLSessionDataDelegate { super.init() // can actually be omitted in this example because will happen automatically. } - func doPing() { + func doPing() async throws { let (_, _bindPort) = getUsablePort(port: uint16(Int.random(in: 9000 ... 36500))) NSLog("doPing: \(item.name)-\(item.remark) - \(_bindPort)") @@ -154,10 +155,13 @@ class PingServer: NSObject, URLSessionDataDelegate { // sleep for wait v2ray process instanse usleep(useconds_t(2 * second)) - // url request let session = URLSession(configuration: getProxyUrlSessionConfigure(httpProxyPort: bindPort), delegate: self, delegateQueue: nil) - let task = session.dataTask(with: URLRequest(url: pingURL)) - task.resume() + do { + let (_,_) = try await session.data(for: URLRequest(url: pingURL)) + } catch let error { + // failed to write file – bad permissions, bad filename, missing permissions, or more likely it can't be converted to the encoding + NSLog("session request fail: \(error)") + } } func createV2rayJsonFileForPing() { @@ -226,9 +230,6 @@ class PingServer: NSObject, URLSessionDataDelegate { } catch let error { print("remove ping config error: \(error)") } - - // refresh servers - ping.pingEnd(item: item) } } @@ -241,17 +242,34 @@ class PingCurrent: NSObject, URLSessionDataDelegate { super.init() // can actually be omitted in this example because will happen automatically. } - func doPing() { + func doPing() { + Task { + do { + try await _doPing() + pingCurrentEnd() + } catch let error { + NSLog("doPing error: \(error)") + } + } + } + + func _doPing() async throws { inPingCurrent = true + usleep(useconds_t(1 * second)) NSLog("PingCurrent start: try=\(tryPing),item=\(item.remark)") // set URLSessionDataDelegate let config = getProxyUrlSessionConfigure() config.timeoutIntervalForRequest = 3 // url request let session = URLSession(configuration: config, delegate: self, delegateQueue: nil) - let task = session.dataTask(with: URLRequest(url: pingURL)) - task.resume() tryPing += 1 + do { + let (data, response) = try await session.data(for: URLRequest(url: pingURL)) + print("doPing: ", data, response) + } catch let error { + // failed to write file – bad permissions, bad filename, missing permissions, or more likely it can't be converted to the encoding + NSLog("save json file fail: \(error)") + } } // MARK: - URLSessionDataDelegate @@ -272,7 +290,6 @@ class PingCurrent: NSObject, URLSessionDataDelegate { } // save item.store() - pingCurrentEnd() } func pingCurrentEnd() { diff --git a/v2rayu/V2rayU/V2raySubscription.swift b/v2rayu/V2rayU/V2raySubscription.swift index b613f0c90b..5264acb30b 100644 --- a/v2rayu/V2rayU/V2raySubscription.swift +++ b/v2rayu/V2rayU/V2raySubscription.swift @@ -235,10 +235,9 @@ class V2raySubItem: NSObject, NSCoding { let NOTIFY_UPDATE_SubSync = Notification.Name(rawValue: "NOTIFY_UPDATE_SubSync") class V2raySubSync: NSObject { - let lock = NSLock() var V2raySubSyncing = false - var group = DispatchGroup() - + let semaphore = DispatchSemaphore(value: 2) // work pool + static var shared = V2raySubSync() // Initialization override init() { @@ -255,27 +254,42 @@ class V2raySubSync: NSObject { self.V2raySubSyncing = true NSLog("V2raySubSync start") - let thread = Thread { - V2raySubscription.loadConfig() - let list = V2raySubscription.list() + V2raySubscription.loadConfig() + + let list = V2raySubscription.list() - if list.count == 0 { - self.logTip(title: "fail: ", uri: "", informativeText: " please add Subscription Url") + if list.count == 0 { + self.logTip(title: "fail: ", uri: "", informativeText: " please add Subscription Url") + } + // sync queue with DispatchGroup + Task { + do { + try await self.syncTaskGroup(items: list) + } catch let error { + NSLog("pingTaskGroup error: \(error)") } - // sync queue with DispatchGroup - self.group = DispatchGroup() - let subQueue = DispatchQueue(label: "subQueue", qos: .background) - for item in list { - subQueue.sync { - self.group.enter() - self.dlFromUrl(url: item.url, subscribe: item.name) + } + } + + func syncTaskGroup(items: [V2raySubItem]) async throws { + await withThrowingTaskGroup(of: Int.self) { group in + for item in items { + group.addTask { + do { + await self.semaphore.wait() + defer { + self.semaphore.signal() + } + try await self.dlFromUrl(url: item.url, subscribe: item.name) + } catch let error { + NSLog("syncTaskGroup error: \(error)") + } + return 1 } } - self.group.wait() - NSLog("V2raySubSync end") - self.refreshMenu() } - thread.start() + print("syncTaskGroup end") + self.refreshMenu() } func refreshMenu() { @@ -293,40 +307,27 @@ class V2raySubSync: NSObject { } } - func importEnd(url: String, subscribe: String) { - self.group.leave() - } - - public func dlFromUrl(url: String, subscribe: String) { + public func dlFromUrl(url: String, subscribe: String) async throws { logTip(title: "loading from : ", uri: "", informativeText: url + "\n\n") guard let reqUrl = URL(string: url) else { logTip(title: "loading from : ", uri: "", informativeText: "url is not valid: " + url + "\n\n") - self.importEnd(url: url, subscribe: subscribe) return } // url request with proxy let session = URLSession(configuration: getProxyUrlSessionConfigure()) - let task = session.dataTask(with: URLRequest(url: reqUrl)){(data: Data?, response: URLResponse?, error: Error?) in - defer { - self.importEnd(url: url, subscribe: subscribe) - } - if error != nil { - self.logTip(title: "loading fail: ", uri: url, informativeText: "error: \(String(describing: error))") + do { + let (data, _) = try await session.data(for: URLRequest(url: reqUrl)) + if let outputStr = String(data: data, encoding: String.Encoding.utf8) { + self.handle(base64Str: outputStr, subscribe: subscribe, url: url) } else { - if data != nil { - if let outputStr = String(data: data!, encoding: String.Encoding.utf8) { - self.handle(base64Str: outputStr, subscribe: subscribe, url: url) - } else { - self.logTip(title: "loading fail: ", uri: url, informativeText: "data is nil") - } - } else { - self.logTip(title: "loading fail: ", uri: url, informativeText: "data is nil") - } + self.logTip(title: "loading fail: ", uri: url, informativeText: "data is nil") } + } catch let error { + // failed to write file – bad permissions, bad filename, missing permissions, or more likely it can't be converted to the encoding + NSLog("save json file fail: \(error)") } - task.resume() } func handle(base64Str: String, subscribe: String, url: String) { diff --git a/xray-core/Makefile b/xray-core/Makefile index 6bb299c7e2..29f580c58d 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -23,7 +23,7 @@ ADDITION = go build -o w$(NAME).exe -trimpath -ldflags "-H windowsgui $(LDFLAGS) else OUTPUT = $(NAME) endif -ifeq ($(shell echo "$(GOARCH)" | grep -Pq "(mips|mipsle)" && echo true),true) # +ifeq ($(shell echo "$(GOARCH)" | grep -Eq "(mips|mipsle)" && echo true),true) # ADDITION = GOMIPS=softfloat go build -o $(NAME)_softfloat -trimpath -ldflags "$(LDFLAGS)" -v $(MAIN) endif .PHONY: clean diff --git a/yass/CMakeLists.txt b/yass/CMakeLists.txt index b116e3fb2e..998a351a79 100644 --- a/yass/CMakeLists.txt +++ b/yass/CMakeLists.txt @@ -413,38 +413,78 @@ endif() ## Export build compilation database if possible set(CMAKE_EXPORT_COMPILE_COMMANDS 1) +include(CMakeDependentOption) + option(CLI "Build with cli." ON) option(SERVER "Build with server." ON) option(GUI "Build against GUI." OFF) -option(BUILD_TESTS "Build with test." OFF) + +cmake_dependent_option(USE_GTK4 + "Build with gtk4 (GUI)" ON + "GUI AND NOT WIN32 AND NOT APPLE AND NOT OHOS AND NOT ANDROID" OFF) + option(BUILD_BENCHMARKS "Build with benchmark." OFF) +option(BUILD_SHARED_LIBS "Build with shared libraries." OFF) +option(BUILD_TESTS "Build with test." OFF) option(OPTIMIZED_PROTOC "Force protobuf compiler to be built with optimization" OFF) -option(USE_TCMALLOC "Build with tcmalloc (linux only)" OFF) + +option(USE_TCMALLOC "Build with tcmalloc" OFF) +cmake_dependent_option( + USE_SYSTEM_TCMALLOC "Build with system or vendored tcmalloc" OFF + USE_TCMALLOC OFF) + option(USE_LIBCXX "Build with libc++" ON) + option(USE_NGHTTP2 "Build with libnghttp2" ON) -option(USE_MOLD "Build with mold linker" OFF) -option(USE_LLD "Build with lld linker" OFF) -option(USE_GOLD "Build with gold linker" OFF) +cmake_dependent_option( + USE_SYSTEM_NGHTTP2 "Build with system or vendored libnghttp2" OFF + USE_NGHTTP2 OFF) + option(USE_ICF "Build with ICF" OFF) option(USE_LTO "Build with LTO" OFF) option(USE_CURL "Build with libcurl (test only)" ON) + option(USE_CARES "Build with c-ares" ON) -option(BUILD_SHARED_LIBS "Build with shared libraries." OFF) +cmake_dependent_option( + USE_SYSTEM_CARES "Build with system or vendored c-ares" OFF + USE_CARES OFF) + option(USE_BUILTIN_CA_BUNDLE_CRT "Build with embedded ca-bundle.crt support" ON) + option(USE_MBEDTLS "Build with mbedtls support" ON) -option(USE_BALSA_HTTP_PARSER "Build with balsa http parser" ON) -option(USE_LEVELDB "Build with leveldb" OFF) -option(USE_SQLITE "Build with sqlite" OFF) -option(USE_OLD_SYSTEMD_SERVICE "Install with old systemd service files" OFF) +cmake_dependent_option( + USE_SYSTEM_MBEDTLS "Build with system or vendored mbedtls" OFF + USE_MBEDTLS OFF) + option(USE_QUICHE "Build with quiche support" ON) + +cmake_dependent_option( + USE_BALSA_HTTP_PARSER "Build with balsa http parser" ON + USE_QUICHE OFF) +cmake_dependent_option( + USE_SYSTEM_HTTP_PARSER "Build with system or vendored http parser" OFF + "NOT USE_BALSA_HTTP_PARSER" OFF) + +option(USE_LEVELDB "Build with leveldb" OFF) + +option(USE_SQLITE "Build with sqlite" OFF) +cmake_dependent_option( + USE_SYSTEM_SQLITE "Build with system or vendored sqlite" OFF + USE_SQLITE OFF) + +option(USE_OLD_SYSTEMD_SERVICE "Install with old systemd service files" OFF) option(USE_IOURING "Build with io uring support" OFF) +option(USE_SYSTEM_ZLIB "Build with system or vendered zlib" OFF) +option(USE_SYSTEM_JSON "Build with system or vendered json library" OFF) option(ENABLE_FORTIFY "Enable build with Fortify Source (linux only)" OFF) option(ENABLE_LTO "Enable build with LTO" ON) option(ENABLE_LLD "Enable build with LLD" ON) option(ENABLE_GOLD "Enable build with GOLD" ON) -option(USE_GTK4 "Build with gtk4 if possible (GUI)" ON) +option(USE_MOLD "Build with mold linker" OFF) +option(USE_LLD "Build with lld linker" OFF) +option(USE_GOLD "Build with gold linker" OFF) # Dynamic users are supported from version 235 # see https://0pointer.net/blog/dynamic-users-with-systemd.html @@ -507,7 +547,7 @@ if (CMAKE_CROSSCOMPILING) list(APPEND YASS_APP_FEATURES "crosscompile") endif() -if (${CMAKE_BUILD_TYPE} MATCHES Release OR ${CMAKE_BUILD_TYPE} MATCHES MinSizeRel OR ${CMAKE_BUILD_TYPE} MATCHES RelWithDebInfo) +if (upper_CMAKE_BUILD_TYPE MATCHES "RELEASE|MINSIZEREL|RELWITHDEBINFO") message(STATUS "Release Build: ${CMAKE_BUILD_TYPE}") set(IS_RELEASE_BUILD ON) else() @@ -546,6 +586,19 @@ if (ENABLE_LTO AND IS_RELEASE_BUILD) endif() endif() +if (NOT MSVC) + if (USE_MOLD) + add_link_options(-fuse-ld=mold -Wl,--gdb-index) + list(APPEND YASS_APP_FEATURES "linker mold") + elseif (USE_LLD) + add_link_options(-fuse-ld=lld) + list(APPEND YASS_APP_FEATURES "linker lld") + elseif (USE_GOLD) + add_link_options(-fuse-ld=gold) + list(APPEND YASS_APP_FEATURES "linker gold") + endif() +endif() + if (COMPILER_MSVC AND USE_LIBCXX) message(SEND_ERROR "Microsoft Visual C++ Compiler with libc++ support is not supported, please disabling it with -DUSE_LIBCXX=off") endif() @@ -720,7 +773,7 @@ if(MSAN) if (MSVC AND NOT MSVC_C_ARCHITECTURE_ID STREQUAL "arm64") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=memory") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=memory") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /fsanitize=memory") + add_link_options(/fsanitize=memory) else() message(FATAL_ERROR "Cannot enable MSAN unless using Clang or Vistual Studio 2019 version 16.9") endif() @@ -728,7 +781,7 @@ if(MSAN) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer") + add_link_options(-fsanitize=memory -fsanitize-memory-track-origins -fno-omit-frame-pointer) endif() add_definitions(-DMEMORY_SANITIZER) list(APPEND YASS_APP_FEATURES "msan") @@ -741,14 +794,14 @@ if(ASAN) if (MSVC AND NOT MSVC_C_ARCHITECTURE_ID STREQUAL "arm64") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=address") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=address") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /fsanitize=address") + add_link_options(/fsanitize=address) else() message(FATAL_ERROR "Cannot enable ASAN unless using Clang or Vistual Studio 2019 version 16.9") endif() else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer") + add_link_options(-fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer) endif() add_definitions(-DADDRESS_SANITIZER) list(APPEND YASS_APP_FEATURES "asan") @@ -775,14 +828,14 @@ if(TSAN) if (MSVC AND NOT MSVC_C_ARCHITECTURE_ID STREQUAL "arm64") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fsanitize=thread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fsanitize=thread") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /fsanitize=thread") + add_link_options(/fsanitize=thread) else() message(FATAL_ERROR "Cannot enable TSAN unless using Clang or Vistual Studio 2019 version 16.9") endif() else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread") + add_link_options(-fsanitize=thread) endif() add_definitions(-DTHREAD_SANITIZER) list(APPEND YASS_APP_FEATURES "tsan") @@ -801,7 +854,7 @@ if(UBSAN) else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=undefined") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined") + add_link_options(-fsanitize=undefined) endif() add_definitions(-DUNDEFINED_SANITIZER) list(APPEND YASS_APP_FEATURES "ubsan") @@ -829,8 +882,7 @@ endif() if (NOT MSAN AND NOT ASAN AND NOT TSAN AND NOT UBSAN) if (NOT APPLE AND NOT MSVC AND NOT MINGW) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs -Wl,--as-needed") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,defs -Wl,--as-needed") + add_link_options(-Wl,-z,defs -Wl,--as-needed) endif() endif() @@ -862,16 +914,13 @@ if (NOT MSVC) endif() if (APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dead_strip") + add_link_options(-Wl,-dead_strip) else() - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections") + add_link_options(-Wl,--gc-sections) endif() if (APPLE AND NOT USE_MOLD) - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,-no_data_in_code_info -Wl,-no_function_starts") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -Wl,-no_data_in_code_info -Wl,-no_function_starts") + add_link_options(-Wl,-no_data_in_code_info -Wl,-no_function_starts) endif() if (APPLE AND COMPILER_CLANG) @@ -948,8 +997,7 @@ if (NOT MSVC) # directly there, not through the compiler driver. # We don't link on goma, so this change is just for cleaner # internal linker invocations, for people who work on the build. - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -no-canonical-prefixes") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-canonical-prefixes") + add_link_options(-no-canonical-prefixes) endif() else() # Enable function-level linking. @@ -998,17 +1046,14 @@ else() ## Disable LTCG for static libraries because this setting introduces ABI incompatibility between minor compiler versions if (NOT MSVC_CRT_LINKAGE STREQUAL "static" AND NOT COMPILER_CLANG) - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /GL") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG") - set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /GL") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GL") + add_link_options(/LTCG) endif() # lld's uac manifest is outdated and incompatible with windows xp if (USE_LLD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFESTUAC:NO") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFESTUAC:NO") + add_link_options(/MANIFESTUAC:NO) endif() ## not omit stack frame pointer @@ -1050,8 +1095,7 @@ else() if (USE_LLD) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -gcodeview-ghash") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gcodeview-ghash") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:GHASH") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:GHASH") + add_link_options(/DEBUG:GHASH) endif() else() set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi") @@ -1059,18 +1103,16 @@ else() endif() # Tell linker to include symbol data - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") + add_link_options(/DEBUG) ## Remove unreferenced data - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /INCREMENTAL:NO /FIXED:NO") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /OPT:REF /OPT:ICF /INCREMENTAL:NO /FIXED:NO") - - list(APPEND YASS_APP_FEATURES "ldflags icf") + if (USE_ICF) + add_link_options(/OPT:REF /OPT:ICF /INCREMENTAL:NO /FIXED:NO) + list(APPEND YASS_APP_FEATURES "ldflags icf") + endif() # Tell linker to include FIXUP information symbol data - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /PROFILE") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /PROFILE") + add_link_options(/PROFILE) # Use constructor homing for debug info. This option reduces debug info # by emitting class type info only when constructors are emitted @@ -1082,18 +1124,18 @@ else() if (USE_LLD) # Use a fake fixed base directory for paths in the pdb to make the pdb # output fully deterministic and independent of the build directory. - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /PDBSourcePath:o:\\fake\\prefix") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /PDBSourcePath:o:\\fake\\prefix") - set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /PDBSourcePath:o:\\fake\\prefix") - set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} /PDBSourcePath:o:\\fake\\prefix") + # verified via llvm-pdbutil pdb2yaml -modules -module-files -subsections=lines,fc yass.pdb|grep Module + # see https://reviews.llvm.org/D53021 and https://reviews.llvm.org/D48882 + if (upper_CMAKE_BUILD_TYPE MATCHES "RELEASE|MINSIZEREL") + add_link_options(/PDBSourcePath:o:\\fake\\prefix) + endif() # Absolutize source file paths for PDB. Pass the real build directory # if the pdb contains source-level debug information and if linker # reproducibility is not critical. - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /PDBSourcePath:${CMAKE_CURRENT_BINARY_DIR}") - set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /PDBSourcePath:${CMAKE_CURRENT_BINARY_DIR}") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /PDBSourcePath:${CMAKE_CURRENT_BINARY_DIR}") - set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /PDBSourcePath:${CMAKE_CURRENT_BINARY_DIR}") + if (upper_CMAKE_BUILD_TYPE MATCHES "DEBUG|RELWITHDEBINFO") + add_link_options(/PDBSourcePath:${CMAKE_CURRENT_BINARY_DIR}) + endif() endif() # Tells the compiler not to use absolute paths when passing the default @@ -1107,61 +1149,48 @@ endif() ## adopt Thin LTO if (LTO AND COMPILER_CLANG AND USE_MOLD) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") + add_compile_options($<$:-flto=thin>) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) # TODO(lgrey): Enable unit splitting for Mac when supported. - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fsplit-lto-unit") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fsplit-lto-unit") + add_compile_options($<$:-fsplit-lto-unit>) endif() if (NOT MSVC) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") + add_link_options(-flto=thin) # In ThinLTO builds, we run at most one link process at a time, # and let it use all cores. # TODO(thakis): Check if '=0' (that is, number of cores, instead # of "all" which means number of hardware threads) is faster. if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=all") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=all") + add_link_options(-Wl,--thinlto-jobs=all) else() include(ProcessorCount) ProcessorCount(CPU_NUMBER) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=${CPU_NUMBER}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=${CPU_NUMBER}") + add_link_options(-Wl,--thinlto-jobs=${CPU_NUMBER}) endif() endif() if (NOT ANDROID AND NOT OHOS AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR APPLE)) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") + add_compile_options($<$:-fwhole-program-vtables>) if (NOT MSVC) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") + add_link_options(-fwhole-program-vtables) endif() endif() endif() ## adopt Thin LTO if (LTO AND COMPILER_CLANG AND USE_LLD) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") + add_compile_options($<$:-flto=thin>) if (NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) # TODO(lgrey): Enable unit splitting for Mac when supported. - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fsplit-lto-unit") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fsplit-lto-unit") + add_compile_options($<$:-fsplit-lto-unit>) endif() # Limit the size of the ThinLTO cache to the lesser of 10% of # available disk space, 40GB and 100000 files. - if (MSVC) - set(cache_policy "cache_size=10%:cache_size_bytes=40g") - else() - set(cache_policy "cache_size=10\\%:cache_size_bytes=40g") - endif() + set(cache_policy "cache_size=10%:cache_size_bytes=40g") if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0) set(cache_policy "${cache_policy}:cache_size_files=100000") @@ -1173,102 +1202,79 @@ if (LTO AND COMPILER_CLANG AND USE_LLD) if (MSVC) # When using lld-link, the -flto option need only be added to the compile step - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} /opt:lldltojobs=all -mllvm:-import-instr-limit=${import_instr_limit} /lldltocache:thinlto-cache /lldltocachepolicy:${cache_policy}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} /opt:lldltojobs=all -mllvm:-import-instr-limit=${import_instr_limit} /lldltocache:thinlto-cache /lldltocachepolicy:${cache_policy}") + add_link_options(/opt:lldltojobs=all -mllvm:-import-instr-limit=${import_instr_limit} /lldltocache:thinlto-cache /lldltocachepolicy:${cache_policy}) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17.0) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -mllvm:-disable-auto-upgrade-debug-info") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -mllvm:-disable-auto-upgrade-debug-info") + add_link_options(-mllvm:-disable-auto-upgrade-debug-info) endif() elseif (NOT MINGW) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") + add_link_options(-flto=thin) # In ThinLTO builds, we run at most one link process at a time, # and let it use all cores. # TODO(thakis): Check if '=0' (that is, number of cores, instead # of "all" which means number of hardware threads) is faster. if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=all") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=all") + add_link_options(-Wl,--thinlto-jobs=all) else() include(ProcessorCount) ProcessorCount(CPU_NUMBER) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=${CPU_NUMBER}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-jobs=${CPU_NUMBER}") + add_link_options(-Wl,--thinlto-jobs=${CPU_NUMBER}) endif() if (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0) if (YASS_TARGET_IS_CROSSCOMPILE_HOST) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-cache_path_lto,${CMAKE_CURRENT_BINARY_DIR}/../thinlto-cache") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-cache_path_lto,${CMAKE_CURRENT_BINARY_DIR}/../thinlto-cache") + add_link_options(-Wl,-cache_path_lto,${CMAKE_CURRENT_BINARY_DIR}/../thinlto-cache) else() - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-cache_path_lto,thinlto-cache") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-cache_path_lto,thinlto-cache") + add_link_options(-Wl,-cache_path_lto,thinlto-cache) endif() - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wcrl,object_path_lto") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wcrl,object_path_lto") - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-cache-policy=${cache_policy}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-cache-policy=${cache_policy}") + add_link_options(-Wcrl,object_path_lto) + add_link_options(-Wl,--thinlto-cache-policy=${cache_policy}) elseif (NOT APPLE) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-cache-dir=thinlto-cache") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-cache-dir=thinlto-cache") - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-cache-policy,${cache_policy}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,--thinlto-cache-policy,${cache_policy}") + add_link_options(-Wl,--thinlto-cache-dir=thinlto-cache) + add_link_options(-Wl,--thinlto-cache-policy,${cache_policy}) endif() - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-mllvm,-import-instr-limit=${import_instr_limit}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-mllvm,-import-instr-limit=${import_instr_limit}") + add_link_options(-Wl,-mllvm,-import-instr-limit=${import_instr_limit}) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17.0) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-mllvm,-disable-auto-upgrade-debug-info") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-mllvm,-disable-auto-upgrade-debug-info") + add_link_options(-Wl,-mllvm,-disable-auto-upgrade-debug-info) endif() endif() if (NOT ANDROID AND NOT OHOS AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR APPLE)) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") + add_compile_options($<$:-fwhole-program-vtables>) if (NOT MSVC) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") + add_link_options(-fwhole-program-vtables) endif() endif() endif() ## adopt Thin LTO if (LTO AND COMPILER_CLANG AND USE_GOLD) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") + add_compile_options($<$:-flto=thin>) # Limit the size of the ThinLTO cache to the lesser of 10% of # available disk space, 40GB and 100000 files. - set(cache_policy "cache_size=10\\%:cache_size_bytes=40g:cache_size_files=100000") + set(cache_policy "cache_size=10%:cache_size_bytes=40g:cache_size_files=100000") # TODO(gbiv): We ideally shouldn't need to specify this; ThinLTO # should be able to better manage binary size increases on its own. set(import_instr_limit 5) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=thin") + add_link_options(-flto=thin) # In ThinLTO builds, we run at most one link process at a time, # and let it use all cores. # TODO(thakis): Check if '=0' (that is, number of cores, instead # of "all" which means number of hardware threads) is faster. - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-plugin-opt,jobs=all") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-plugin-opt,jobs=all") + add_link_options(-Wl,-plugin-opt,jobs=all) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-plugin-opt,cache-dir=thinlto-cache") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-plugin-opt,cache-dir=thinlto-cache") + add_link_options(-Wl,-plugin-opt,cache-dir=thinlto-cache) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-plugin-opt,cache-policy=${cache_policy}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-plugin-opt,cache-policy=${cache_policy}") + add_link_options(-Wl,-plugin-opt,cache-policy=${cache_policy}) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-mllvm,-import-instr-limit=${import_instr_limit}") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wl,-mllvm,-import-instr-limit=${import_instr_limit}") + add_link_options(-Wl,-mllvm,-import-instr-limit=${import_instr_limit}) if (NOT ANDROID AND NOT OHOS AND (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64" OR APPLE)) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") + add_compile_options($<$:-fwhole-program-vtables>) if (NOT MSVC) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -fwhole-program-vtables") + add_link_options(-fwhole-program-vtables) endif() endif() endif() @@ -1277,27 +1283,21 @@ endif() ## old gcc has regression on c++17 mode ## https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81004 if (LTO AND COMPILER_GCC) - set(CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=auto") - set(CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=auto") - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=auto") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -flto=auto") + add_compile_options($<$:-flto=auto>) + add_link_options(-flto=auto) # gcc is known to fails at combining -std=c++14 and -std=c++17 objects (fixed in gcc 8.4) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89358 # and another https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84044 (fixed in gcc 9.1) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.1) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-error=odr") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-error=odr") + add_link_options(-Wno-error=odr) endif() # silence lto warning on old gcc, fixed in latest gcc if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-error=odr") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-error=odr") + add_link_options(-Wno-error=odr) elseif (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0) - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-lto-type-mismatch") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-lto-type-mismatch") + add_link_options(-Wno-lto-type-mismatch) else() - set(CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_SHARED_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-lto-type-mismatch -Wno-odr -Wno-error=uninitialized") - set(CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE} "${CMAKE_EXE_LINKER_FLAGS_${upper_CMAKE_BUILD_TYPE}} -Wno-lto-type-mismatch -Wno-odr -Wno-error=uninitialized") + add_link_options(-Wno-lto-type-mismatch -Wno-odr -Wno-error=uninitialized) endif() endif() @@ -1365,26 +1365,12 @@ if (NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector") endif() - if (USE_MOLD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=mold") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=mold") - list(APPEND YASS_APP_FEATURES "linker mold") - endif() - - if (USE_LLD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") - list(APPEND YASS_APP_FEATURES "linker lld") - endif() - # Linker warnings. if (FALSE) if (NOT APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--fatal-warnings") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--fatal-warnings") + add_link_options(-Wl,--fatal-warnings) else () - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-fatal_warnings") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-fatal_warnings") + add_link_options(-Wl,-fatal_warnings) endif() endif() endif() @@ -1395,14 +1381,11 @@ if (UNIX AND NOT APPLE) # Explicitly pass --build-id to ld. Compilers used to always pass this # implicitly but don't any more (in particular clang when built without # ENABLE_LINKER_BUILD_ID=ON). - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} -Wl,--build-id=sha1") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -Wl,--build-id=sha1") - set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "${CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL} -Wl,--build-id=sha1") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -Wl,--build-id=sha1") - set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} -Wl,--build-id=sha1") - set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} -Wl,--build-id=sha1") - set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} -Wl,--build-id") - set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -Wl,--build-id") + if (IS_RELEASE_BUILD) + add_link_options(-Wl,--build-id=sha1) + else() + add_link_options(-Wl,--build-id) + endif() # _FILE_OFFSET_BITS=64 should not be set on Android in order to maintain # the behavior of the Android NDK from earlier versions. @@ -1432,11 +1415,8 @@ if ((UNIX AND NOT APPLE) OR ANDROID OR OHOS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe") endif() - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro") - - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,now") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,now") + add_link_options(-Wl,-z,noexecstack -Wl,-z,relro) + add_link_options(-Wl,-z,now) endif() # Linux-specific compiler flags setup. @@ -1446,13 +1426,9 @@ if ((UNIX AND NOT APPLE) AND USE_LLD) # Reduce the page size from 65536 in order to reduce binary size slightly # by shrinking the alignment gap between segments. This also causes all # segments to be mapped adjacently, which breakpad relies on. - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=4096") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=4096") + add_link_options(-Wl,-z,max-page-size=4096) endif() elseif (USE_GOLD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold") - list(APPEND YASS_APP_FEATURES "linker gold") if (NOT ANDROID AND NOT OHOS) # On Android, this isn't needed. gcc in the NDK knows to look next to # it with -fuse-ld=gold, and clang gets a --gcc-toolchain flag passed @@ -1465,8 +1441,7 @@ elseif (USE_GOLD) # linker might not be gold, but isn't used much anyway. # FIXME crashing on aarch64 build machine if (FALSE) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--threads -Wl,--thread-count=4") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--threads -Wl,--thread-count=4") + add_link_options(-Wl,--threads -Wl,--thread-count=4) endif() endif() @@ -1480,8 +1455,7 @@ if (USE_ICF AND (NOT APPLE OR COMPILER_CLANG) AND NOT MSVC) # Gold doesn't respect section alignment and breaks gcc builds with icf # https://sourceware.org/bugzilla/show_bug.cgi?id=17704 # Landed upstream Fri, 21 Oct 2016 - is in 2.28, such as CentOS 7 - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--icf=all") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--icf=all") + add_link_options(-Wl,--icf=all) list(APPEND YASS_APP_FEATURES "ldflags icf") endif() @@ -1524,19 +1498,16 @@ if (USE_LLD) if (MSVC) # On Windows, we call the linker directly, instead of calling it through # the driver. - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --color-diagnostics") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --color-diagnostics") + add_link_options(--color-diagnostics) elseif (NOT MINGW) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--color-diagnostics") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--color-diagnostics") + add_link_options(-Wl,--color-diagnostics) endif() endif() # Enable text section splitting only on linux when using lld for now. Other # platforms can be added later if needed. if ((UNIX AND NOT APPLE) AND USE_LLD) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,keep-text-section-prefix") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,keep-text-section-prefix") + add_link_options(-Wl,-z,keep-text-section-prefix) endif() if (COMPILER_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0) @@ -1546,11 +1517,9 @@ if (COMPILER_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -instcombine-lower-dbg-declare=0") if (USE_LLD) if (MSVC) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mllvm:-instcombine-lower-dbg-declare=0") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mllvm:-instcombine-lower-dbg-declare=0") + add_link_options(-mllvm:-instcombine-lower-dbg-declare=0) else() - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-mllvm,-instcombine-lower-dbg-declare=0") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-mllvm,-instcombine-lower-dbg-declare=0") + add_link_options(-Wl,-mllvm,-instcombine-lower-dbg-declare=0) endif() endif() @@ -1601,15 +1570,13 @@ endif() # Pass flag to LLD so Android builds can allow debuggerd to properly symbolize # stack crashes (http://crbug.com/919499). if (USE_LLD AND ANDROID) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-rosegment") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-rosegment") + add_link_options(-Wl,--no-rosegment) endif() # TODO(crbug.com/1374347): Cleanup undefined symbol errors caught by # --no-undefined-version. if (USE_LLD AND NOT WIN32 AND NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--undefined-version") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--undefined-version") + add_link_options(-Wl,--undefined-version) endif() # Apple: pass --strict-auto-link to ld64.lld @@ -1620,8 +1587,7 @@ endif() # After https://reviews.llvm.org/D140491, this will only happen if the link fails, # matching ld64. Passing `--strict-auto-link` restores the old behavior. if (USE_LLD AND APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--strict-auto-link") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--strict-auto-link") + add_link_options(-Wl,--strict-auto-link) endif() # LLD does call-graph-sorted binary layout by default when profile data is @@ -1630,13 +1596,11 @@ endif() # beneficial. if (USE_LLD) if (MSVC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /call-graph-profile-sort:no") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /call-graph-profile-sort:no") + add_link_options(/call-graph-profile-sort:no) elseif (NOT APPLE AND NOT MINGW AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0) # TODO(thakis): Once LLD's Mach-O port basically works, implement call # graph profile sorting for it, add an opt-out flag, and pass it here. - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-call-graph-profile-sort") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-call-graph-profile-sort") + add_link_options(-Wl,--no-call-graph-profile-sort) endif() endif() @@ -1758,13 +1722,11 @@ if (WIN32) # set linker option for x86 if (MSVC_PROCESSOR_ARCHITECTURE STREQUAL "x86") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH /largeaddressaware") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH /largeaddressaware") + add_link_options(/SAFESEH /largeaddressaware) endif() if (MSVC) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DYNAMICBASE /NXCOMPAT") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DYNAMICBASE /NXCOMPAT") + add_link_options(/DYNAMICBASE /NXCOMPAT) endif() if (MSVC AND ALLOW_XP) @@ -1837,21 +1799,18 @@ if (ANDROID) # Don't allow visible symbols from libraries that contain # assembly code with symbols that aren't hidden properly. # http://crbug.com/448386 - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--exclude-libs=libvpx_assembly_arm.a") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--exclude-libs=libvpx_assembly_arm.a") + add_link_options(-Wl,--exclude-libs=libvpx_assembly_arm.a) # Reduce the page size from 65536 in order to reduce binary size slightly # by shrinking the alignment gap between segments. This also causes all # segments to be mapped adjacently, which breakpad relies on. if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm64.*") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=4096") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,max-page-size=4096") + add_link_options(-Wl,-z,max-page-size=4096) endif() # Instead of using an unwind lib from the toolchain, # buildtools/third_party/libunwind will be built and used directly. - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --unwindlib=none") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --unwindlib=none") + add_link_options(--unwindlib=none) list(APPEND YASS_APP_FEATURES "libunwind") @@ -2035,8 +1994,7 @@ int main() { include_directories(third_party/lss) endif() if (APPLE AND COMPILER_CLANG) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Foundation -framework SystemConfiguration") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Foundation -framework SystemConfiguration") + link_libraries("-framework Foundation" "-framework SystemConfiguration") endif() endif() @@ -2444,12 +2402,10 @@ elseif (USE_TCMALLOC) # patching manually, see tcmalloc's README_windows.txt if (MSVC) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /INCLUDE:\"__tcmalloc\"") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCLUDE:\"__tcmalloc\"") + add_link_options(/INCLUDE:__tcmalloc) endif() if (MINGW) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-u__tcmalloc") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-u__tcmalloc") + add_link_options(-Wl,-u__tcmalloc) endif() endif() @@ -2507,7 +2463,7 @@ if (MSVC AND MSVC_CRT_LINKAGE STREQUAL "dynamic" AND NOT ALLOW_XP AND ${CMAKE_BU file(COPY "${_CRASHPAD_BINARY_PREFIX}/crashpad_handler.exe" DESTINATION ${CMAKE_BINARY_DIR}) - install(FILES "${_CRASHPAD_BINARY_PREFIX}/crashpad_handler.exe" DESTINATION bin) + install(FILES "${_CRASHPAD_BINARY_PREFIX}/crashpad_handler.exe" DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() if (IOS) @@ -3345,7 +3301,28 @@ endif() # sqlite3 Library # ***************************************************************************************** -if (USE_SQLITE) +if (USE_SYSTEM_SQLITE) + find_package(PkgConfig) + if (PKG_CONFIG_FOUND) + pkg_check_modules(SQLITE sqlite3) + endif() + if(NOT SQLITE_FOUND) + message(STATUS "System sqlite3 not found, using bundled one") + set(USE_SYSTEM_SQLITE FALSE) + endif() +endif() + +if (USE_SYSTEM_SQLITE AND USE_SQLITE) + message(STATUS "Compiling with system sqlite3 library") + list(APPEND YASS_APP_FEATURES "system sqlite3 library") + set(SUPPORT_DEFINITIONS + HAVE_SQLITE + ${SUPPORT_DEFINITIONS} + ) + include_directories(${SQLITE_INCLUDE_DIRS}) + link_directories(${SQLITE_LIBRARY_DIRS}) + link_libraries(${SQLITE_LIBRARIES}) +elseif (USE_SQLITE) message(STATUS "Compiling with bundled sqlite3 library") add_subdirectory(third_party/sqlite) list(APPEND YASS_APP_FEATURES "sqlite3") @@ -3522,8 +3499,7 @@ if (COMPILER_GCC OR COMPILER_CLANG) # this may happens if (COMPILER_CLANG) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wno-unused-command-line-argument") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wno-unused-command-line-argument") + add_link_options(-Wno-unused-command-line-argument) endif() if (COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) @@ -3969,8 +3945,8 @@ if (CLI) ) if (NOT CMAKE_SKIP_INSTALL_RULES AND NOT WIN32 AND NOT IOS) - install(TARGETS yass_cli RUNTIME DESTINATION bin) - install(FILES doc/yass_cli.1 DESTINATION share/man/man1) + install(TARGETS yass_cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(FILES doc/yass_cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) # TODO add freebsd rc files if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID AND NOT OHOS) install(FILES yass.json.sample RENAME config.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/yass) @@ -4020,8 +3996,8 @@ if (SERVER) ) if (NOT CMAKE_SKIP_INSTALL_RULES AND NOT WIN32 AND NOT IOS) - install(TARGETS yass_server RUNTIME DESTINATION bin) - install(FILES doc/yass_server.1 DESTINATION share/man/man1) + install(TARGETS yass_server RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(FILES doc/yass_server.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/) if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT ANDROID AND NOT OHOS) install(FILES yass-server.json.sample RENAME server.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/yass) install(FILES yass-server${SYSTEMD_SERVICE_SUFFIX}.service RENAME yass-server.service DESTINATION lib/systemd/system) @@ -4624,7 +4600,7 @@ if (GUI) if (NOT CMAKE_SKIP_INSTALL_RULES) # installable, except on macOS when marked as MACOSX_BUNDLE if (NOT APPLE) - install(TARGETS ${APP_NAME} RUNTIME DESTINATION bin) + install(TARGETS ${APP_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) endif() if (GUI_FLAVOUR STREQUAL "gtk3" OR GUI_FLAVOUR STREQUAL "gtk4") diff --git a/yt-dlp/CONTRIBUTORS b/yt-dlp/CONTRIBUTORS index b2a476bea8..e0d1668ee2 100644 --- a/yt-dlp/CONTRIBUTORS +++ b/yt-dlp/CONTRIBUTORS @@ -630,3 +630,4 @@ TuxCoder voidful vtexier WyohKnott +trueauracoral diff --git a/yt-dlp/Changelog.md b/yt-dlp/Changelog.md index 0d27f1a921..267330208e 100644 --- a/yt-dlp/Changelog.md +++ b/yt-dlp/Changelog.md @@ -4,6 +4,17 @@ # To create a release, dispatch the https://github.com/yt-dlp/yt-dlp/actions/workflows/release.yml workflow on master --> +### 2024.05.27 + +#### Extractor changes +- [Fix parsing of base URL in SMIL manifest](https://github.com/yt-dlp/yt-dlp/commit/26603d0b34898818992bee4598e0607c07059511) ([#9225](https://github.com/yt-dlp/yt-dlp/issues/9225)) by [seproDev](https://github.com/seproDev) +- **peertube**: [Support livestreams](https://github.com/yt-dlp/yt-dlp/commit/12b248ce60be1aa1362edd839d915bba70dbee4b) ([#10044](https://github.com/yt-dlp/yt-dlp/issues/10044)) by [bashonly](https://github.com/bashonly), [trueauracoral](https://github.com/trueauracoral) +- **piksel**: [Update domain](https://github.com/yt-dlp/yt-dlp/commit/ae2194e1dd4a99d32eb3cab7c48a0ff03101ef3b) ([#9223](https://github.com/yt-dlp/yt-dlp/issues/9223)) by [seproDev](https://github.com/seproDev) +- **tiktok**: user: [Fix extraction loop](https://github.com/yt-dlp/yt-dlp/commit/c53c2e40fde8f2e15c7c62f8ca1a5d9e90ddc079) ([#10035](https://github.com/yt-dlp/yt-dlp/issues/10035)) by [bashonly](https://github.com/bashonly) + +#### Misc. changes +- **cleanup**: Miscellaneous: [5e3e19c](https://github.com/yt-dlp/yt-dlp/commit/5e3e19c93c52830da98d9d1ed84ea7a559efefbd) by [bashonly](https://github.com/bashonly) + ### 2024.05.26 #### Core changes diff --git a/yt-dlp/README.md b/yt-dlp/README.md index e757567b5a..e8cd6d3a06 100644 --- a/yt-dlp/README.md +++ b/yt-dlp/README.md @@ -401,6 +401,9 @@ If you fork the project on GitHub, you can run your fork's [build workflow](.git --impersonate CLIENT[:OS] Client to impersonate for requests. E.g. chrome, chrome-110, chrome:windows-10. Pass --impersonate="" to impersonate any client. + Note that forcing impersonation for all + requests may have a detrimental impact on + download speed and stability --list-impersonate-targets List available clients to impersonate. -4, --force-ipv4 Make all connections via IPv4 -6, --force-ipv6 Make all connections via IPv6 diff --git a/yt-dlp/yt_dlp/extractor/peertube.py b/yt-dlp/yt_dlp/extractor/peertube.py index b7919c0734..fb4d025621 100644 --- a/yt-dlp/yt_dlp/extractor/peertube.py +++ b/yt-dlp/yt_dlp/extractor/peertube.py @@ -1470,11 +1470,15 @@ class PeerTubeIE(InfoExtractor): title = video['name'] - formats = [] + formats, is_live = [], False files = video.get('files') or [] for playlist in (video.get('streamingPlaylists') or []): if not isinstance(playlist, dict): continue + if playlist_url := url_or_none(playlist.get('playlistUrl')): + is_live = True + formats.extend(self._extract_m3u8_formats( + playlist_url, video_id, fatal=False, live=True)) playlist_files = playlist.get('files') if not (playlist_files and isinstance(playlist_files, list)): continue @@ -1498,6 +1502,7 @@ class PeerTubeIE(InfoExtractor): f['vcodec'] = 'none' else: f['fps'] = int_or_none(file_.get('fps')) + is_live = False formats.append(f) description = video.get('description') @@ -1555,6 +1560,7 @@ class PeerTubeIE(InfoExtractor): 'categories': categories, 'formats': formats, 'subtitles': subtitles, + 'is_live': is_live, 'webpage_url': webpage_url, } diff --git a/yt-dlp/yt_dlp/options.py b/yt-dlp/yt_dlp/options.py index 997b575cd4..9615bfbaa4 100644 --- a/yt-dlp/yt_dlp/options.py +++ b/yt-dlp/yt_dlp/options.py @@ -520,7 +520,8 @@ def create_parser(): metavar='CLIENT[:OS]', dest='impersonate', default=None, help=( 'Client to impersonate for requests. E.g. chrome, chrome-110, chrome:windows-10. ' - 'Pass --impersonate="" to impersonate any client.'), + 'Pass --impersonate="" to impersonate any client. Note that forcing impersonation ' + 'for all requests may have a detrimental impact on download speed and stability'), ) network.add_option( '--list-impersonate-targets', diff --git a/yt-dlp/yt_dlp/version.py b/yt-dlp/yt_dlp/version.py index 415dc0eaf9..a90b288c9a 100644 --- a/yt-dlp/yt_dlp/version.py +++ b/yt-dlp/yt_dlp/version.py @@ -1,8 +1,8 @@ # Autogenerated by devscripts/update-version.py -__version__ = '2024.05.26' +__version__ = '2024.05.27' -RELEASE_GIT_HEAD = 'ae2af1104f80caf2f47544763a33db2c17a3e1de' +RELEASE_GIT_HEAD = '12b248ce60be1aa1362edd839d915bba70dbee4b' VARIANT = None @@ -12,4 +12,4 @@ CHANNEL = 'stable' ORIGIN = 'yt-dlp/yt-dlp' -_pkg_version = '2024.05.26' +_pkg_version = '2024.05.27'