diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts index 4a8bb1054e..d53a7cf77b 100644 --- a/packages/backend/src/core/RelayService.ts +++ b/packages/backend/src/core/RelayService.ts @@ -16,6 +16,7 @@ import { deepClone } from '@/misc/clone.js'; import { bindThis } from '@/decorators.js'; import { SystemAccountService } from '@/core/SystemAccountService.js'; import { UserKeypairService } from './UserKeypairService.js'; +import type { PrivateKeyWithPem } from '@misskey-dev/node-http-message-signatures'; @Injectable() export class RelayService { diff --git a/packages/backend/src/core/SystemAccountService.ts b/packages/backend/src/core/SystemAccountService.ts index 53c047dd74..92748c28d5 100644 --- a/packages/backend/src/core/SystemAccountService.ts +++ b/packages/backend/src/core/SystemAccountService.ts @@ -18,7 +18,7 @@ import { DI } from '@/di-symbols.js'; import { bindThis } from '@/decorators.js'; import { generateNativeUserToken } from '@/misc/token.js'; import { IdService } from '@/core/IdService.js'; -import { genRsaKeyPair } from '@/misc/gen-key-pair.js'; +import { genRSAAndEd25519KeyPair } from '@/misc/gen-key-pair.js'; export const SYSTEM_ACCOUNT_TYPES = ['actor', 'relay', 'proxy'] as const; @@ -119,7 +119,7 @@ export class SystemAccountService implements OnApplicationShutdown { // Generate secret const secret = generateNativeUserToken(); - const keyPair = await genRsaKeyPair(); + const keyPair = await genRSAAndEd25519KeyPair(); let account!: MiUser; @@ -148,9 +148,8 @@ export class SystemAccountService implements OnApplicationShutdown { }).then(x => transactionalEntityManager.findOneByOrFail(MiUser, x.identifiers[0])); await transactionalEntityManager.insert(MiUserKeypair, { - publicKey: keyPair.publicKey, - privateKey: keyPair.privateKey, userId: account.id, + ...keyPair, }); await transactionalEntityManager.insert(MiUserProfile, { diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts index cc0bd0c280..6b440fff52 100644 --- a/packages/backend/src/core/activitypub/ApDbResolverService.ts +++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts @@ -16,7 +16,6 @@ import type { MiNote } from '@/models/Note.js'; import { bindThis } from '@/decorators.js'; import { MiLocalUser, MiRemoteUser } from '@/models/User.js'; import Logger from '@/logger.js'; -import { UtilityService } from '@/core/UtilityService.js'; import { getApId } from './type.js'; import { ApPersonService } from './models/ApPersonService.js'; import { ApLoggerService } from './ApLoggerService.js'; @@ -70,12 +69,6 @@ export class ApDbResolverService implements OnApplicationShutdown { this.redisForSub.on('message', this.onMessage); } - private punyHost(url: string): string { - const urlObj = new URL(url); - const host = `${this.utilityService.toPuny(urlObj.hostname)}${urlObj.port.length > 0 ? ':' + urlObj.port : ''}`; - return host; - } - @bindThis public parseUri(value: string | IObject): UriParseResult { const separator = '/'; @@ -170,7 +163,7 @@ export class ApDbResolverService implements OnApplicationShutdown { } | null> { if (keyId) { - if (this.punyHost(uri) !== this.punyHost(keyId)) { + if (this.utilityService.punyHost(uri) !== this.utilityService.punyHost(keyId)) { /** * keyIdはURL形式かつkeyIdのホストはuriのホストと一致するはず * （ApPersonService.validateActorに由来） diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fb5c17d9ba..aa84438ff1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -118,16 +118,11 @@ importers: specifier: 8.2.0 version: 8.2.0 '@fastify/view': -<<<<<<< HEAD specifier: 10.0.2 version: 10.0.2 -======= - specifier: 10.0.1 - version: 10.0.1 '@misskey-dev/node-http-message-signatures': specifier: 0.0.10 version: 0.0.10 ->>>>>>> re-ed25519 '@misskey-dev/sharp-read-bmp': specifier: 1.2.0 version: 1.2.0 @@ -144,16 +139,8 @@ importers: specifier: 11.1.3 version: 11.1.3(@nestjs/common@11.1.3(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@10.4.19)(reflect-metadata@0.2.2)(rxjs@7.8.2) '@nestjs/testing': -<<<<<<< HEAD specifier: 11.1.3 version: 11.1.3(@nestjs/common@11.1.3(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.3)(@nestjs/platform-express@10.4.19) - '@peertube/http-signature': - specifier: 1.7.0 - version: 1.7.0 -======= - specifier: 10.4.7 - version: 10.4.7(@nestjs/common@10.4.7(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.7(@nestjs/common@10.4.7(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.7)(encoding@0.1.13)(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/platform-express@10.4.7(@nestjs/common@10.4.7(reflect-metadata@0.2.2)(rxjs@7.8.1))(@nestjs/core@10.4.7)) ->>>>>>> re-ed25519 '@sentry/node': specifier: 8.55.0 version: 8.55.0 @@ -3110,25 +3097,8 @@ packages: peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.10.0' -<<<<<<< HEAD '@opentelemetry/instrumentation-amqplib@0.46.0': resolution: {integrity: sha512-04VHHV1KIN/c1wLWwzmLI02d/welgscBJ4BuDqrHaxd+ZIdlVXK9UYQsYf3JwSeF52z/4YoSzr8bfdVBSWoMAg==} -======= - '@opentelemetry/core@1.26.0': - resolution: {integrity: sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - - '@opentelemetry/core@1.28.0': - resolution: {integrity: sha512-ZLwRMV+fNDpVmF2WYUdBHlq0eOWtEaUJSusrzjGnBt7iSRvfjFE3RXYUZJrqou/wIDWV0DwQ5KIfYe9WXg9Xqw==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.10.0' - - '@opentelemetry/instrumentation-amqplib@0.43.0': - resolution: {integrity: sha512-ALjfQC+0dnIEcvNYsbZl/VLh7D2P1HhFF4vicRKHhHFIUV3Shpg4kXgiek5PLhmeKSIPiUB25IYH5RIneclL4A==} ->>>>>>> re-ed25519 engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': ^1.3.0 @@ -3293,24 +3263,14 @@ packages: resolution: {integrity: sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==} engines: {node: '>=14'} -<<<<<<< HEAD '@opentelemetry/resources@1.30.1': resolution: {integrity: sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA==} -======= - '@opentelemetry/resources@1.28.0': - resolution: {integrity: sha512-cIyXSVJjGeTICENN40YSvLDAq4Y2502hGK3iN7tfdynQLKWb3XWZQEkPc+eSx47kiy11YeFAlYkEfXwR1w8kfw==} ->>>>>>> re-ed25519 engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.10.0' -<<<<<<< HEAD '@opentelemetry/sdk-trace-base@1.30.1': resolution: {integrity: sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg==} -======= - '@opentelemetry/sdk-trace-base@1.28.0': - resolution: {integrity: sha512-ceUVWuCpIao7Y5xE02Xs3nQi0tOGmMea17ecBdwtCvdo9ekmO+ijc9RFDgfifMl7XCBf41zne/1POM3LqSTZDA==} ->>>>>>> re-ed25519 engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.10.0' @@ -5150,7 +5110,6 @@ packages: ajv@8.17.1: resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==} -<<<<<<< HEAD alien-signals@1.0.3: resolution: {integrity: sha512-zQOh3wAYK5ujENxvBBR3CFGF/b6afaSzZ/c9yNhJ1ENrGHETvpUuKQsa93Qrclp0+PzTF93MaZ7scVp1uUozhA==} @@ -5161,10 +5120,6 @@ packages: analytics@0.8.16: resolution: {integrity: sha512-LEFQ47G9V1zVp9WIh2xhnbmSFEJq+WEzSv6voJ5uba88lefiIIYeG2nq87gFu83ocz1qtb9u7XgeaKKVBbbgWA==} -======= - alien-signals@0.2.2: - resolution: {integrity: sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==} ->>>>>>> re-ed25519 ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -7799,10 +7754,6 @@ packages: resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==} engines: {node: '>=0.10.0'} - jsprim@1.4.2: - resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==} - engines: {node: '>=0.6.0'} - jsprim@2.0.2: resolution: {integrity: sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==} engines: {'0': node >=0.6.0} @@ -10146,19 +10097,13 @@ packages: resolution: {integrity: sha512-ERPW+XkvX9W2A+ov07iy+ZFJpVdik04GhDA4eVogiG9hpC97Kem2iucyzhFxbFRvQ5o2UckFtKZdp1hkGvnrEw==} engines: {node: '>=16'} -<<<<<<< HEAD - stylehacks@7.0.5: - resolution: {integrity: sha512-5kNb7V37BNf0Q3w+1pxfa+oiNPS++/b4Jil9e/kPDgrk1zjEd6uR7SZeJiYaLYH6RRSC1XX2/37OTeU/4FvuIA==} - engines: {node: ^18.12.0 || ^20.9.0 || >=22.0} -======= structured-headers@1.0.1: resolution: {integrity: sha512-QYBxdBtA4Tl5rFPuqmbmdrS9kbtren74RTJTcs0VSQNVV5iRhJD4QlYTLD0+81SBwUQctjEQzjTRI3WG4DzICA==} engines: {node: '>= 14', npm: '>=6'} - stylehacks@6.1.1: - resolution: {integrity: sha512-gSTTEQ670cJNoaeIp9KX6lZmm8LJ3jPB5yJmX8Zq/wQxOsAFXV3qjWzHas3YYk1qesuVIyYWWUpZ0vSE/dTSGg==} - engines: {node: ^14 || ^16 || >=18.0} ->>>>>>> re-ed25519 + stylehacks@7.0.5: + resolution: {integrity: sha512-5kNb7V37BNf0Q3w+1pxfa+oiNPS++/b4Jil9e/kPDgrk1zjEd6uR7SZeJiYaLYH6RRSC1XX2/37OTeU/4FvuIA==} + engines: {node: ^18.12.0 || ^20.9.0 || >=22.0} peerDependencies: postcss: ^8.4.32 @@ -10846,6 +10791,9 @@ packages: vue-component-type-helpers@2.2.10: resolution: {integrity: sha512-iDUO7uQK+Sab2tYuiP9D1oLujCWlhHELHMgV/cB13cuGbG4qwkLHvtfWb6FzvxrIOPDnU0oHsz2MlQjhYDeaHA==} + vue-component-type-helpers@3.0.1: + resolution: {integrity: sha512-j23mCB5iEbGsyIhnVdXdWUOg+UdwmVxpKnYYf2j+4ppCt5VSFXKjwu9YFt0QYxUaf5G99PuHsVfRScjHCRSsGQ==} + vue-demi@0.14.7: resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} engines: {node: '>=12'} @@ -11681,29 +11629,6 @@ snapshots: '@babel/compat-data@7.24.7': {} -<<<<<<< HEAD -======= - '@babel/core@7.23.5': - dependencies: - '@ampproject/remapping': 2.2.1 - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.23.5 - '@babel/helper-compilation-targets': 7.22.15 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5) - '@babel/helpers': 7.23.5 - '@babel/parser': 7.25.6 - '@babel/template': 7.22.15 - '@babel/traverse': 7.24.7 - '@babel/types': 7.25.6 - convert-source-map: 2.0.0 - debug: 4.3.7(supports-color@8.1.1) - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - ->>>>>>> re-ed25519 '@babel/core@7.24.7': dependencies: '@ampproject/remapping': 2.3.0 @@ -11717,27 +11642,13 @@ snapshots: '@babel/traverse': 7.24.7 '@babel/types': 7.25.6 convert-source-map: 2.0.0 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 transitivePeerDependencies: - supports-color -<<<<<<< HEAD -======= - '@babel/generator@7.23.5': - dependencies: - '@babel/types': 7.25.6 - '@jridgewell/gen-mapping': 0.3.2 - '@jridgewell/trace-mapping': 0.3.18 - jsesc: 2.5.2 - ->>>>>>> re-ed25519 '@babel/generator@7.24.7': dependencies: '@babel/types': 7.25.6 @@ -11755,32 +11666,16 @@ snapshots: '@babel/helper-environment-visitor@7.24.7': dependencies: -<<<<<<< HEAD '@babel/types': 7.27.1 -======= - '@babel/types': 7.25.6 ->>>>>>> re-ed25519 '@babel/helper-function-name@7.24.7': dependencies: '@babel/template': 7.24.7 -<<<<<<< HEAD '@babel/types': 7.27.1 '@babel/helper-hoist-variables@7.24.7': dependencies: '@babel/types': 7.27.1 -======= - '@babel/types': 7.25.6 - - '@babel/helper-hoist-variables@7.24.7': - dependencies: - '@babel/types': 7.25.6 - - '@babel/helper-module-imports@7.22.15': - dependencies: - '@babel/types': 7.25.6 ->>>>>>> re-ed25519 '@babel/helper-module-imports@7.24.7': dependencies: @@ -11789,18 +11684,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD -======= - '@babel/helper-module-transforms@7.23.3(@babel/core@7.23.5)': - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-environment-visitor': 7.24.7 - '@babel/helper-module-imports': 7.22.15 - '@babel/helper-simple-access': 7.22.5 - '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 - ->>>>>>> re-ed25519 '@babel/helper-module-transforms@7.24.7(@babel/core@7.24.7)': dependencies: '@babel/core': 7.24.7 @@ -11814,13 +11697,6 @@ snapshots: '@babel/helper-plugin-utils@7.22.5': {} -<<<<<<< HEAD -======= - '@babel/helper-simple-access@7.22.5': - dependencies: - '@babel/types': 7.25.6 - ->>>>>>> re-ed25519 '@babel/helper-simple-access@7.24.7': dependencies: '@babel/traverse': 7.24.7 @@ -11842,17 +11718,6 @@ snapshots: '@babel/helper-validator-option@7.24.7': {} -<<<<<<< HEAD -======= - '@babel/helpers@7.23.5': - dependencies: - '@babel/template': 7.22.15 - '@babel/traverse': 7.24.7 - '@babel/types': 7.25.6 - transitivePeerDependencies: - - supports-color - ->>>>>>> re-ed25519 '@babel/helpers@7.24.7': dependencies: '@babel/template': 7.24.7 @@ -11947,31 +11812,11 @@ snapshots: dependencies: regenerator-runtime: 0.14.0 -<<<<<<< HEAD '@babel/template@7.24.7': dependencies: '@babel/code-frame': 7.24.7 '@babel/parser': 7.27.2 '@babel/types': 7.27.1 -======= - '@babel/template@7.22.15': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 - - '@babel/template@7.24.0': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 - - '@babel/template@7.24.7': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 ->>>>>>> re-ed25519 '@babel/traverse@7.24.7': dependencies: @@ -11983,11 +11828,7 @@ snapshots: '@babel/helper-split-export-declaration': 7.24.7 '@babel/parser': 7.25.6 '@babel/types': 7.25.6 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -12324,13 +12165,8 @@ snapshots: '@eslint/config-array@0.20.0': dependencies: -<<<<<<< HEAD '@eslint/object-schema': 2.1.6 debug: 4.4.1(supports-color@10.0.0) -======= - '@eslint/object-schema': 2.1.4 - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -12344,11 +12180,7 @@ snapshots: '@eslint/eslintrc@3.3.1': dependencies: ajv: 6.12.6 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 espree: 10.3.0 globals: 14.0.0 ignore: 5.3.1 @@ -12890,17 +12722,7 @@ snapshots: react-docgen-typescript: 2.2.2(typescript@5.8.3) vite: 6.3.5(@types/node@22.15.31)(sass@1.89.2)(terser@5.42.0)(tsx@4.19.4) optionalDependencies: -<<<<<<< HEAD typescript: 5.8.3 -======= - typescript: 5.6.3 - - '@jridgewell/gen-mapping@0.3.2': - dependencies: - '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.5.0 - '@jridgewell/trace-mapping': 0.3.25 ->>>>>>> re-ed25519 '@jridgewell/gen-mapping@0.3.5': dependencies: @@ -13218,25 +13040,9 @@ snapshots: '@opentelemetry/instrumentation-amqplib@0.46.0(@opentelemetry/api@1.9.0)': dependencies: '@opentelemetry/api': 1.9.0 -<<<<<<< HEAD '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.28.0 -======= - '@opentelemetry/semantic-conventions': 1.27.0 - - '@opentelemetry/core@1.28.0(@opentelemetry/api@1.9.0)': - dependencies: - '@opentelemetry/api': 1.9.0 - '@opentelemetry/semantic-conventions': 1.27.0 - - '@opentelemetry/instrumentation-amqplib@0.43.0(@opentelemetry/api@1.9.0)': - dependencies: - '@opentelemetry/api': 1.9.0 - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.27.0 ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -13477,7 +13283,6 @@ snapshots: '@opentelemetry/redis-common@0.36.2': {} -<<<<<<< HEAD '@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0)': dependencies: '@opentelemetry/api': 1.9.0 @@ -13490,22 +13295,6 @@ snapshots: '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.28.0 -======= - '@opentelemetry/resources@1.28.0(@opentelemetry/api@1.9.0)': - dependencies: - '@opentelemetry/api': 1.9.0 - '@opentelemetry/core': 1.28.0(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.27.0 - - '@opentelemetry/sdk-trace-base@1.28.0(@opentelemetry/api@1.9.0)': - dependencies: - '@opentelemetry/api': 1.9.0 - '@opentelemetry/core': 1.28.0(@opentelemetry/api@1.9.0) - '@opentelemetry/resources': 1.28.0(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.27.0 - - '@opentelemetry/semantic-conventions@1.25.1': {} ->>>>>>> re-ed25519 '@opentelemetry/semantic-conventions@1.27.0': {} @@ -13615,28 +13404,14 @@ snapshots: pvtsutils: 1.3.5 tslib: 2.8.1 -<<<<<<< HEAD - '@peertube/http-signature@1.7.0': - dependencies: - assert-plus: 1.0.0 - jsprim: 1.4.2 - sshpk: 1.18.0 - -======= ->>>>>>> re-ed25519 '@pkgjs/parseargs@0.11.0': optional: true '@prisma/instrumentation@5.22.0': dependencies: '@opentelemetry/api': 1.9.0 -<<<<<<< HEAD '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0) '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0) -======= - '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0) - '@opentelemetry/sdk-trace-base': 1.28.0(@opentelemetry/api@1.9.0) ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -13874,7 +13649,6 @@ snapshots: '@sentry/node@8.55.0': dependencies: '@opentelemetry/api': 1.9.0 -<<<<<<< HEAD '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0) @@ -13908,48 +13682,10 @@ snapshots: '@prisma/instrumentation': 5.22.0 '@sentry/core': 8.55.0 '@sentry/opentelemetry': 8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0) -======= - '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.9.0) - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-amqplib': 0.43.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-connect': 0.40.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-dataloader': 0.12.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-express': 0.44.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-fastify': 0.41.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-fs': 0.16.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-generic-pool': 0.39.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-graphql': 0.44.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-hapi': 0.41.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-ioredis': 0.43.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-kafkajs': 0.4.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-knex': 0.41.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-koa': 0.43.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-lru-memoizer': 0.40.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-mongodb': 0.48.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-mongoose': 0.42.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-mysql': 0.41.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-mysql2': 0.41.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-nestjs-core': 0.40.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-pg': 0.44.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-redis-4': 0.42.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-tedious': 0.15.0(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation-undici': 0.6.0(@opentelemetry/api@1.9.0) - '@opentelemetry/resources': 1.28.0(@opentelemetry/api@1.9.0) - '@opentelemetry/sdk-trace-base': 1.28.0(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.27.0 - '@prisma/instrumentation': 5.19.1 - '@sentry/core': 8.38.0 - '@sentry/opentelemetry': 8.38.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.28.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.27.0) - '@sentry/types': 8.38.0 - '@sentry/utils': 8.38.0 ->>>>>>> re-ed25519 import-in-the-middle: 1.11.2 transitivePeerDependencies: - supports-color -<<<<<<< HEAD '@sentry/opentelemetry@8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)': dependencies: '@opentelemetry/api': 1.9.0 @@ -13959,18 +13695,6 @@ snapshots: '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0) '@opentelemetry/semantic-conventions': 1.28.0 '@sentry/core': 8.55.0 -======= - '@sentry/opentelemetry@8.38.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.28.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.27.0)': - dependencies: - '@opentelemetry/api': 1.9.0 - '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0) - '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0) - '@opentelemetry/sdk-trace-base': 1.28.0(@opentelemetry/api@1.9.0) - '@opentelemetry/semantic-conventions': 1.27.0 - '@sentry/core': 8.38.0 - '@sentry/types': 8.38.0 - '@sentry/utils': 8.38.0 ->>>>>>> re-ed25519 '@sentry/profiling-node@8.55.0': dependencies: @@ -14726,23 +14450,15 @@ snapshots: dependencies: '@storybook/components': 8.6.14(storybook@8.6.14(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)) '@storybook/global': 5.0.0 -<<<<<<< HEAD '@storybook/manager-api': 8.6.14(storybook@8.6.14(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)) '@storybook/preview-api': 8.6.14(storybook@8.6.14(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)) '@storybook/theming': 8.6.14(storybook@8.6.14(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5)) '@vue/compiler-core': 3.5.16 storybook: 8.6.14(bufferutil@4.0.9)(prettier@3.5.3)(utf-8-validate@6.0.5) -======= - '@storybook/manager-api': 8.4.4(storybook@8.4.4(bufferutil@4.0.8)(prettier@3.3.3)(utf-8-validate@6.0.4)) - '@storybook/preview-api': 8.4.4(storybook@8.4.4(bufferutil@4.0.8)(prettier@3.3.3)(utf-8-validate@6.0.4)) - '@storybook/theming': 8.4.4(storybook@8.4.4(bufferutil@4.0.8)(prettier@3.3.3)(utf-8-validate@6.0.4)) - '@vue/compiler-core': 3.5.11 - storybook: 8.4.4(bufferutil@4.0.8)(prettier@3.3.3)(utf-8-validate@6.0.4) ->>>>>>> re-ed25519 ts-dedent: 2.2.0 type-fest: 2.19.0 vue: 3.5.16(typescript@5.8.3) - vue-component-type-helpers: 2.2.10 + vue-component-type-helpers: 3.0.1 '@stylistic/eslint-plugin@2.13.0(eslint@9.28.0)(typescript@5.8.3)': dependencies: @@ -15397,7 +15113,6 @@ snapshots: '@typescript-eslint/scope-manager@8.34.0': dependencies: -<<<<<<< HEAD '@typescript-eslint/types': 8.34.0 '@typescript-eslint/visitor-keys': 8.34.0 @@ -15413,16 +15128,6 @@ snapshots: eslint: 9.28.0 ts-api-utils: 2.1.0(typescript@5.8.3) typescript: 5.8.3 -======= - '@typescript-eslint/scope-manager': 7.17.0 - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 7.17.0 - debug: 4.3.5(supports-color@5.5.0) - eslint: 9.14.0 - optionalDependencies: - typescript: 5.6.3 ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -15430,57 +15135,12 @@ snapshots: '@typescript-eslint/typescript-estree@8.34.0(typescript@5.8.3)': dependencies: -<<<<<<< HEAD '@typescript-eslint/project-service': 8.34.0(typescript@5.8.3) '@typescript-eslint/tsconfig-utils': 8.34.0(typescript@5.8.3) '@typescript-eslint/types': 8.34.0 '@typescript-eslint/visitor-keys': 8.34.0 debug: 4.4.1(supports-color@10.0.0) fast-glob: 3.3.3 -======= - '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/visitor-keys': 7.1.0 - - '@typescript-eslint/scope-manager@7.17.0': - dependencies: - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/visitor-keys': 7.17.0 - - '@typescript-eslint/type-utils@7.1.0(eslint@9.14.0)(typescript@5.6.3)': - dependencies: - '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.6.3) - '@typescript-eslint/utils': 7.1.0(eslint@9.14.0)(typescript@5.6.3) - debug: 4.3.5(supports-color@5.5.0) - eslint: 9.14.0 - ts-api-utils: 1.0.1(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/type-utils@7.17.0(eslint@9.14.0)(typescript@5.6.3)': - dependencies: - '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.6.3) - '@typescript-eslint/utils': 7.17.0(eslint@9.14.0)(typescript@5.6.3) - debug: 4.3.5(supports-color@5.5.0) - eslint: 9.14.0 - ts-api-utils: 1.3.0(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 - transitivePeerDependencies: - - supports-color - - '@typescript-eslint/types@7.1.0': {} - - '@typescript-eslint/types@7.17.0': {} - - '@typescript-eslint/typescript-estree@7.1.0(typescript@5.6.3)': - dependencies: - '@typescript-eslint/types': 7.1.0 - '@typescript-eslint/visitor-keys': 7.1.0 - debug: 4.3.5(supports-color@5.5.0) - globby: 11.1.0 ->>>>>>> re-ed25519 is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.7.2 @@ -15491,25 +15151,12 @@ snapshots: '@typescript-eslint/utils@8.34.0(eslint@9.28.0)(typescript@5.8.3)': dependencies: -<<<<<<< HEAD '@eslint-community/eslint-utils': 4.7.0(eslint@9.28.0) '@typescript-eslint/scope-manager': 8.34.0 '@typescript-eslint/types': 8.34.0 '@typescript-eslint/typescript-estree': 8.34.0(typescript@5.8.3) eslint: 9.28.0 typescript: 5.8.3 -======= - '@typescript-eslint/types': 7.17.0 - '@typescript-eslint/visitor-keys': 7.17.0 - debug: 4.3.5(supports-color@5.5.0) - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.4 - semver: 7.6.0 - ts-api-utils: 1.3.0(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -15527,21 +15174,10 @@ snapshots: '@vitest/coverage-v8@3.2.3(vitest@3.2.3(@types/debug@4.1.12)(@types/node@22.15.31)(happy-dom@17.6.3)(jsdom@26.1.0(bufferutil@4.0.9)(canvas@3.1.0)(utf-8-validate@6.0.5))(msw@2.10.2(@types/node@22.15.31)(typescript@5.8.3))(sass@1.89.2)(terser@5.42.0)(tsx@4.19.4))': dependencies: -<<<<<<< HEAD '@ampproject/remapping': 2.3.0 '@bcoe/v8-coverage': 1.0.2 ast-v8-to-istanbul: 0.3.3 debug: 4.4.1(supports-color@10.0.0) -======= - vite: 5.4.11(@types/node@22.9.0)(sass@1.79.4)(terser@5.36.0) - vue: 3.5.12(typescript@5.6.3) - - '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@22.9.0)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.79.3)(terser@5.36.0))': - dependencies: - '@ampproject/remapping': 2.2.1 - '@bcoe/v8-coverage': 0.2.3 - debug: 4.3.5(supports-color@5.5.0) ->>>>>>> re-ed25519 istanbul-lib-coverage: 3.2.2 istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 5.0.6 @@ -15555,34 +15191,6 @@ snapshots: transitivePeerDependencies: - supports-color -<<<<<<< HEAD -======= - '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@22.9.0)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.4)(terser@5.36.0))': - dependencies: - '@ampproject/remapping': 2.2.1 - '@bcoe/v8-coverage': 0.2.3 - debug: 4.3.5(supports-color@5.5.0) - istanbul-lib-coverage: 3.2.2 - istanbul-lib-report: 3.0.1 - istanbul-lib-source-maps: 5.0.4 - istanbul-reports: 3.1.6 - magic-string: 0.30.10 - magicast: 0.3.4 - picocolors: 1.0.1 - std-env: 3.7.0 - strip-literal: 2.1.0 - test-exclude: 6.0.0 - vitest: 1.6.0(@types/node@22.9.0)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.79.4)(terser@5.36.0) - transitivePeerDependencies: - - supports-color - - '@vitest/expect@1.6.0': - dependencies: - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - chai: 4.3.10 - ->>>>>>> re-ed25519 '@vitest/expect@2.0.5': dependencies: '@vitest/spy': 2.0.5 @@ -15747,13 +15355,8 @@ snapshots: '@vue/language-core@2.0.16(typescript@5.8.3)': dependencies: '@volar/language-core': 2.2.0 -<<<<<<< HEAD '@vue/compiler-dom': 3.5.14 '@vue/shared': 3.5.14 -======= - '@vue/compiler-dom': 3.5.11 - '@vue/shared': 3.5.11 ->>>>>>> re-ed25519 computeds: 0.0.1 minimatch: 9.0.5 path-browserify: 1.0.1 @@ -15766,15 +15369,9 @@ snapshots: '@volar/language-core': 2.4.11 '@vue/compiler-dom': 3.5.13 '@vue/compiler-vue2': 2.7.16 -<<<<<<< HEAD '@vue/shared': 3.5.13 alien-signals: 1.0.3 minimatch: 9.0.5 -======= - '@vue/shared': 3.5.11 - alien-signals: 0.2.2 - minimatch: 9.0.4 ->>>>>>> re-ed25519 muggle-string: 0.4.1 path-browserify: 1.0.1 optionalDependencies: @@ -15923,24 +15520,12 @@ snapshots: agent-base@6.0.2: dependencies: -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color optional: true -<<<<<<< HEAD agent-base@7.1.3: {} -======= - agent-base@7.1.0: - dependencies: - debug: 4.3.5(supports-color@5.5.0) - transitivePeerDependencies: - - supports-color ->>>>>>> re-ed25519 aggregate-error@3.1.0: dependencies: @@ -16000,7 +15585,6 @@ snapshots: json-schema-traverse: 1.0.0 require-from-string: 2.0.2 -<<<<<<< HEAD alien-signals@1.0.3: {} analytics-utils@1.0.14(@types/dlv@1.1.5): @@ -16015,9 +15599,6 @@ snapshots: '@analytics/storage-utils': 0.4.2 transitivePeerDependencies: - '@types/dlv' -======= - alien-signals@0.2.2: {} ->>>>>>> re-ed25519 ansi-colors@4.1.3: {} @@ -17077,15 +16658,9 @@ snapshots: optionalDependencies: supports-color: 10.0.0 -<<<<<<< HEAD debug@4.4.1(supports-color@5.5.0): dependencies: ms: 2.1.3 -======= - debug@4.3.5(supports-color@5.5.0): - dependencies: - ms: 2.1.2 ->>>>>>> re-ed25519 optionalDependencies: supports-color: 5.5.0 @@ -17452,13 +17027,8 @@ snapshots: esbuild-register@3.5.0(esbuild@0.25.5): dependencies: -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) esbuild: 0.25.5 -======= - debug: 4.3.7(supports-color@8.1.1) - esbuild: 0.24.0 ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -17631,13 +17201,8 @@ snapshots: '@types/json-schema': 7.0.15 ajv: 6.12.6 chalk: 4.1.2 -<<<<<<< HEAD cross-spawn: 7.0.6 debug: 4.4.1(supports-color@10.0.0) -======= - cross-spawn: 7.0.3 - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 escape-string-regexp: 4.0.0 eslint-scope: 8.3.0 eslint-visitor-keys: 4.2.0 @@ -17924,13 +17489,8 @@ snapshots: pino: 9.2.0 process-warning: 5.0.0 rfdc: 1.4.1 -<<<<<<< HEAD secure-json-parse: 4.0.0 semver: 7.7.2 -======= - secure-json-parse: 2.7.0 - semver: 7.6.0 ->>>>>>> re-ed25519 toad-cache: 3.7.0 fastq@1.17.1: @@ -18055,11 +17615,7 @@ snapshots: follow-redirects@1.15.9(debug@4.4.1): optionalDependencies: -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 for-each@0.3.3: dependencies: @@ -18457,13 +18013,8 @@ snapshots: http-proxy-agent@7.0.2: dependencies: -<<<<<<< HEAD agent-base: 7.1.3 debug: 4.4.1(supports-color@10.0.0) -======= - agent-base: 7.1.0 - debug: 4.3.5(supports-color@5.5.0) ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -18491,31 +18042,15 @@ snapshots: https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.5(supports-color@5.5.0) ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color optional: true https-proxy-agent@7.0.6(supports-color@10.0.0): dependencies: -<<<<<<< HEAD agent-base: 7.1.3 debug: 4.4.1(supports-color@10.0.0) -======= - agent-base: 7.1.0 - debug: 4.3.5(supports-color@5.5.0) - transitivePeerDependencies: - - supports-color - - https-proxy-agent@7.0.5: - dependencies: - agent-base: 7.1.0 - debug: 4.3.5(supports-color@5.5.0) ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -18796,11 +18331,7 @@ snapshots: istanbul-lib-instrument@5.2.1: dependencies: '@babel/core': 7.24.7 -<<<<<<< HEAD '@babel/parser': 7.27.2 -======= - '@babel/parser': 7.25.6 ->>>>>>> re-ed25519 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 6.3.1 @@ -18825,11 +18356,7 @@ snapshots: istanbul-lib-source-maps@4.0.1: dependencies: -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: @@ -18838,11 +18365,7 @@ snapshots: istanbul-lib-source-maps@5.0.6: dependencies: '@jridgewell/trace-mapping': 0.3.25 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.5(supports-color@5.5.0) ->>>>>>> re-ed25519 istanbul-lib-coverage: 3.2.2 transitivePeerDependencies: - supports-color @@ -19247,13 +18770,8 @@ snapshots: webidl-conversions: 7.0.0 whatwg-encoding: 3.1.1 whatwg-mimetype: 4.0.0 -<<<<<<< HEAD whatwg-url: 14.2.0 ws: 8.18.2(bufferutil@4.0.9)(utf-8-validate@6.0.5) -======= - whatwg-url: 14.0.0 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) ->>>>>>> re-ed25519 xml-name-validator: 5.0.0 optionalDependencies: canvas: 3.1.0 @@ -19317,13 +18835,6 @@ snapshots: jsonpointer@5.0.1: {} - jsprim@1.4.2: - dependencies: - assert-plus: 1.0.0 - extsprintf: 1.3.0 - json-schema: 0.4.0 - verror: 1.10.0 - jsprim@2.0.2: dependencies: assert-plus: 1.0.0 @@ -19867,11 +19378,7 @@ snapshots: micromark@4.0.0: dependencies: '@types/debug': 4.1.12 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 decode-named-character-reference: 1.0.2 devlop: 1.1.0 micromark-core-commonmark: 2.0.0 @@ -20204,21 +19711,12 @@ snapshots: nodemon@3.1.10: dependencies: -<<<<<<< HEAD chokidar: 4.0.3 debug: 4.4.1(supports-color@5.5.0) ignore-by-default: 1.0.1 minimatch: 3.1.2 pstree.remy: 1.1.8 semver: 7.7.2 -======= - chokidar: 3.5.3 - debug: 4.3.5(supports-color@5.5.0) - ignore-by-default: 1.0.1 - minimatch: 3.1.2 - pstree.remy: 1.1.8 - semver: 7.6.0 ->>>>>>> re-ed25519 simple-update-notifier: 2.0.0 supports-color: 5.5.0 touch: 3.1.0 @@ -21260,11 +20758,7 @@ snapshots: require-in-the-middle@7.3.0: dependencies: -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 module-details-from-path: 1.0.3 resolve: 1.22.8 transitivePeerDependencies: @@ -21623,13 +21117,8 @@ snapshots: dependencies: '@hapi/hoek': 11.0.4 '@hapi/wreck': 18.0.1 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) joi: 17.13.3 -======= - debug: 4.3.5(supports-color@5.5.0) - joi: 17.11.0 ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -21727,15 +21216,9 @@ snapshots: socks-proxy-agent@8.0.5: dependencies: -<<<<<<< HEAD agent-base: 7.1.3 debug: 4.4.1(supports-color@10.0.0) socks: 2.8.4 -======= - agent-base: 7.1.0 - debug: 4.3.7(supports-color@8.1.1) - socks: 2.7.1 ->>>>>>> re-ed25519 transitivePeerDependencies: - supports-color @@ -21831,11 +21314,7 @@ snapshots: arg: 5.0.2 bluebird: 3.7.2 check-more-types: 2.24.0 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) -======= - debug: 4.3.7(supports-color@8.1.1) ->>>>>>> re-ed25519 execa: 5.1.1 lazy-ass: 1.6.0 ps-tree: 1.2.0 @@ -22007,13 +21486,9 @@ snapshots: '@tokenizer/token': 0.3.0 peek-readable: 5.3.1 -<<<<<<< HEAD - stylehacks@7.0.5(postcss@8.5.4): -======= structured-headers@1.0.1: {} - stylehacks@6.1.1(postcss@8.4.49): ->>>>>>> re-ed25519 + stylehacks@7.0.5(postcss@8.5.4): dependencies: browserslist: 4.24.5 postcss: 8.5.4 @@ -22575,35 +22050,10 @@ snapshots: vite-node@3.2.3(@types/node@22.15.31)(sass@1.89.2)(terser@5.42.0)(tsx@4.19.4): dependencies: cac: 6.7.14 -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) es-module-lexer: 1.7.0 pathe: 2.0.3 vite: 6.3.5(@types/node@22.15.31)(sass@1.89.2)(terser@5.42.0)(tsx@4.19.4) -======= - debug: 4.3.7(supports-color@8.1.1) - pathe: 1.1.2 - picocolors: 1.0.1 - vite: 5.4.11(@types/node@22.9.0)(sass@1.79.3)(terser@5.36.0) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - sass-embedded - - stylus - - sugarss - - supports-color - - terser - - vite-node@1.6.0(@types/node@22.9.0)(sass@1.79.4)(terser@5.36.0): - dependencies: - cac: 6.7.14 - debug: 4.3.7(supports-color@8.1.1) - pathe: 1.1.2 - picocolors: 1.0.1 - vite: 5.4.11(@types/node@22.9.0)(sass@1.79.4)(terser@5.36.0) ->>>>>>> re-ed25519 transitivePeerDependencies: - '@types/node' - jiti @@ -22717,6 +22167,8 @@ snapshots: vue-component-type-helpers@2.2.10: {} + vue-component-type-helpers@3.0.1: {} + vue-demi@0.14.7(vue@3.5.16(typescript@5.8.3)): dependencies: vue: 3.5.16(typescript@5.8.3) @@ -22725,13 +22177,8 @@ snapshots: dependencies: '@babel/parser': 7.25.6 '@babel/types': 7.25.6 -<<<<<<< HEAD '@vue/compiler-dom': 3.5.13 '@vue/compiler-sfc': 3.5.16 -======= - '@vue/compiler-dom': 3.5.11 - '@vue/compiler-sfc': 3.5.12 ->>>>>>> re-ed25519 ast-types: 0.16.1 hash-sum: 2.0.0 lru-cache: 8.0.4 @@ -22743,19 +22190,11 @@ snapshots: vue-eslint-parser@10.1.3(eslint@9.28.0): dependencies: -<<<<<<< HEAD debug: 4.4.1(supports-color@10.0.0) eslint: 9.28.0 eslint-scope: 8.3.0 eslint-visitor-keys: 4.2.0 espree: 10.3.0 -======= - debug: 4.3.5(supports-color@5.5.0) - eslint: 9.14.0 - eslint-scope: 7.2.2 - eslint-visitor-keys: 3.4.3 - espree: 9.6.1 ->>>>>>> re-ed25519 esquery: 1.6.0 lodash: 4.17.21 semver: 7.7.2