diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 34b59adefdf2..4a757588a2f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6615,25 +6615,9 @@ packages: /@storybook/jest@0.2.2(vitest@0.34.5): resolution: {integrity: sha512-PUfp9WoqUA8NdAmiz3UahUsyAMr+g1Dv3BB0fqJZsE2IuE5o1Mgsv4iLGzFm+ohcQLIDQvwvvbQIpxe8eY7TNw==} dependencies: -<<<<<<< HEAD - '@storybook/channels': 7.0.27 - '@storybook/client-logger': 7.0.27 - '@storybook/core-events': 7.0.27 - '@storybook/global': 5.0.0 - '@storybook/preview-api': 7.0.27 - dev: true - - /@storybook/jest@0.1.0: - resolution: {integrity: sha512-TmybnEXlv5Fu2/Hq4nRj7alS9mw4CasLR0RDwaAzS+Vpvu1TC4+j9rh+b1BHtmWebbJh0JMT6mgzPqOyJdgtQA==} - dependencies: - '@storybook/expect': 28.1.3-5 - '@storybook/instrumenter': 7.0.2 - '@testing-library/jest-dom': 5.16.5 -======= '@storybook/expect': 28.1.3-5 '@testing-library/jest-dom': 6.1.2(@types/jest@28.1.3)(vitest@0.34.5) '@types/jest': 28.1.3 ->>>>>>> 2023.9.3 jest-mock: 27.5.1 transitivePeerDependencies: - '@jest/globals' @@ -7691,16 +7675,6 @@ packages: /@types/jest@28.1.3: resolution: {integrity: sha512-Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw==} -<<<<<<< HEAD - dependencies: - jest-matcher-utils: 28.1.3 - pretty-format: 28.1.3 - dev: true - - /@types/jest@29.5.3: - resolution: {integrity: sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==} -======= ->>>>>>> 2023.9.3 dependencies: jest-matcher-utils: 28.1.3 pretty-format: 28.1.3 @@ -8043,18 +8017,8 @@ packages: requiresBuild: true dev: false -<<<<<<< HEAD - /@types/webgl2@0.0.6: - resolution: {integrity: sha512-50GQhDVTq/herLMiqSQkdtRu+d5q/cWHn4VvKJtrj4DJAjo1MNkWYa2MA41BaBO1q1HgsUjuQvEOk0QHvlnAaQ==} - requiresBuild: true - dev: false - - /@types/websocket@1.0.5: - resolution: {integrity: sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ==} -======= /@types/websocket@1.0.7: resolution: {integrity: sha512-62Omr8U0PO+hgjLCpPnMsmjh2/FRwIGOktZHyYAUzooEJotwkXHMp7vCacdYi8haxBNOiw9bc2HIHI+b/MPNjA==} ->>>>>>> 2023.9.3 dependencies: '@types/node': 20.7.1 dev: true @@ -8288,11 +8252,7 @@ packages: dependencies: magic-string: 0.30.3 pathe: 1.1.1 -<<<<<<< HEAD - pretty-format: 29.6.2 -======= pretty-format: 29.7.0 ->>>>>>> 2023.9.3 dev: true /@vitest/spy@0.34.5: @@ -8306,11 +8266,7 @@ packages: dependencies: diff-sequences: 29.6.3 loupe: 2.3.6 -<<<<<<< HEAD - pretty-format: 29.6.2 -======= pretty-format: 29.7.0 ->>>>>>> 2023.9.3 dev: true /@volar/language-core@1.10.0: @@ -8735,22 +8691,6 @@ packages: engines: {node: '>= 6.0.0'} dev: false -<<<<<<< HEAD - /append-buffer@1.0.2: - resolution: {integrity: sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==} - engines: {node: '>=0.10.0'} - dependencies: - buffer-equal: 1.0.1 - dev: false - - /aproba@1.2.0: - resolution: {integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==} - requiresBuild: true - dev: false - optional: true - -======= ->>>>>>> 2023.9.3 /aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} dev: false @@ -8803,12 +8743,8 @@ packages: dependencies: delegates: 1.0.0 readable-stream: 3.6.0 -<<<<<<< HEAD - dev: true -======= dev: false optional: true ->>>>>>> 2023.9.3 /are-we-there-yet@3.0.1: resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==} @@ -9915,22 +9851,6 @@ packages: engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} dev: true -<<<<<<< HEAD - /coa@1.0.4: - resolution: {integrity: sha512-KAGck/eNAmCL0dcT3BiuYwLbExK6lduR8DxM3C1TyDzaXhZHyZ8ooX5I5+na2e3dPFuibfxrGdorr0/Lr7RYCQ==} - engines: {node: '>= 0.8.0'} - dependencies: - q: 1.5.1 - dev: false - - /code-point-at@1.1.0: - resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==} - engines: {node: '>=0.10.0'} - requiresBuild: true - dev: false - -======= ->>>>>>> 2023.9.3 /collect-v8-coverage@1.0.1: resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==} dev: true @@ -11523,32 +11443,11 @@ packages: resolution: {integrity: sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: -<<<<<<< HEAD - '@jest/expect-utils': 29.6.1 - '@types/node': 20.4.5 - jest-get-type: 29.4.3 - jest-matcher-utils: 29.6.2 - jest-message-util: 29.6.1 - jest-util: 29.6.1 - dev: true - - /expect@29.6.2: - resolution: {integrity: sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/expect-utils': 29.6.2 - '@types/node': 20.4.5 - jest-get-type: 29.4.3 - jest-matcher-utils: 29.6.2 - jest-message-util: 29.6.2 - jest-util: 29.6.2 -======= '@jest/expect-utils': 29.7.0 jest-get-type: 29.6.3 jest-matcher-utils: 29.7.0 jest-message-util: 29.7.0 jest-util: 29.7.0 ->>>>>>> 2023.9.3 dev: true /exponential-backoff@3.1.1: @@ -12150,12 +12049,8 @@ packages: string-width: 4.2.3 strip-ansi: 6.0.1 wide-align: 1.1.5 -<<<<<<< HEAD - dev: true -======= dev: false optional: true ->>>>>>> 2023.9.3 /gauge@4.0.4: resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==} @@ -13100,17 +12995,6 @@ packages: resolution: {integrity: sha512-TAYDUkvyBmxqneRU26zzpeHLAgtzEOIsRQWrtDidPT/tFK3Yc0WKgtF3u4oOEAiN0kAuVfl7MTgbD0vXdFDztA==} dev: false -<<<<<<< HEAD - /is-fullwidth-code-point@1.0.0: - resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==} - engines: {node: '>=0.10.0'} - requiresBuild: true - dependencies: - number-is-nan: 1.0.1 - dev: false - -======= ->>>>>>> 2023.9.3 /is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} @@ -13551,11 +13435,6 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: chalk: 4.1.2 -<<<<<<< HEAD - diff-sequences: 29.4.3 - jest-get-type: 29.4.3 - pretty-format: 29.6.2 -======= diff-sequences: 29.6.3 jest-get-type: 29.6.3 pretty-format: 29.7.0 @@ -13569,7 +13448,6 @@ packages: diff-sequences: 29.6.3 jest-get-type: 29.6.3 pretty-format: 29.7.0 ->>>>>>> 2023.9.3 dev: true /jest-docblock@29.7.0: @@ -13658,16 +13536,6 @@ packages: pretty-format: 28.1.3 dev: true -<<<<<<< HEAD - /jest-matcher-utils@28.1.3: - resolution: {integrity: sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==} - engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} - dependencies: - chalk: 4.1.2 - jest-diff: 28.1.3 - jest-get-type: 28.0.2 - pretty-format: 28.1.3 -======= /jest-matcher-utils@29.7.0: resolution: {integrity: sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -13676,7 +13544,6 @@ packages: jest-diff: 29.7.0 jest-get-type: 29.6.3 pretty-format: 29.7.0 ->>>>>>> 2023.9.3 dev: true /jest-message-util@29.7.0: @@ -13689,26 +13556,7 @@ packages: chalk: 4.1.2 graceful-fs: 4.2.11 micromatch: 4.0.5 -<<<<<<< HEAD - pretty-format: 29.6.2 - slash: 3.0.0 - stack-utils: 2.0.6 - dev: true - - /jest-message-util@29.6.2: - resolution: {integrity: sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@babel/code-frame': 7.22.5 - '@jest/types': 29.6.1 - '@types/stack-utils': 2.0.1 - chalk: 4.1.2 - graceful-fs: 4.2.11 - micromatch: 4.0.5 - pretty-format: 29.6.2 -======= pretty-format: 29.7.0 ->>>>>>> 2023.9.3 slash: 3.0.0 stack-utils: 2.0.6 dev: true @@ -15336,12 +15184,8 @@ packages: console-control-strings: 1.1.0 gauge: 3.0.2 set-blocking: 2.0.0 -<<<<<<< HEAD - dev: true -======= dev: false optional: true ->>>>>>> 2023.9.3 /npmlog@6.0.2: resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==} @@ -15367,19 +15211,6 @@ packages: dependencies: boolbase: 1.0.0 -<<<<<<< HEAD - /num2fraction@1.2.2: - resolution: {integrity: sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==} - dev: false - - /number-is-nan@1.0.1: - resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==} - engines: {node: '>=0.10.0'} - requiresBuild: true - dev: false - -======= ->>>>>>> 2023.9.3 /nwsapi@2.2.5: resolution: {integrity: sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==} dev: false