diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c44b9e1fd00..3d1cc2d4f788 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1015,7 +1015,13 @@ importers: version: 8.49.0 eslint-config-turbo: specifier: latest +<<<<<<< HEAD version: 2.1.3(eslint@8.49.0) +||||||| parent of e6d310e4e (update lockfile) + version: 2.1.0(eslint@8.49.0) +======= + version: 2.0.14(eslint@8.49.0) +>>>>>>> e6d310e4e (update lockfile) eslint-plugin-import: specifier: 2.26.x version: 2.26.0(@typescript-eslint/parser@6.10.0(eslint@8.49.0)(typescript@5.5.4))(eslint@8.49.0) @@ -5589,8 +5595,16 @@ packages: peerDependencies: eslint: '>=7.0.0' +<<<<<<< HEAD eslint-config-turbo@2.1.3: resolution: {integrity: sha512-smdkhd01V/e/I4EjJxaZA1kxZ1vdFCHpyryolxLtRBP0bZTrHDYh1H6NAyZ3Fy1jkhsQzXw+L+6m17ygROvNFw==} +||||||| parent of e6d310e4e (update lockfile) + eslint-config-turbo@2.1.0: + resolution: {integrity: sha512-3SeE2OCWnkA/84adGJXABm++966LNGxRdXtXKBcplJdIe4PmERkov1z6Kzp2PrPKT13wGu/bwoLV5h1rm7v9ug==} +======= + eslint-config-turbo@2.0.14: + resolution: {integrity: sha512-VkzAH/AR1/fjMsqzuurfWkEgyGVTTzfZQB1umDB8dMWzFhqo8p/2KEWbvRQLEvSFxjVfeJl5ErQAJ7h7DYglxg==} +>>>>>>> e6d310e4e (update lockfile) peerDependencies: eslint: '>6.6.0' @@ -5664,8 +5678,16 @@ packages: peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 +<<<<<<< HEAD eslint-plugin-turbo@2.1.3: resolution: {integrity: sha512-I9vPArzyOSYa6bm0iMCgD07MgdExc1VK2wGuVz21g4BUdj83w7mDKyCXR2rwOtCEW+wemFwgxanJ81imQZijNg==} +||||||| parent of e6d310e4e (update lockfile) + eslint-plugin-turbo@2.1.0: + resolution: {integrity: sha512-+CWVY29y7Qa+gvrKSzP+TOYrHAlNLCh/97K5VtDdnpH54h/JFmnd3U0aSG6WANe0HgAK8NHQfeWFDdRzfDqbKA==} +======= + eslint-plugin-turbo@2.0.14: + resolution: {integrity: sha512-E++MSAEeWZTU0FYARrfakMPq+7XeltqeY4JBDQTzbGEWG3kgYJPeYBMWsypcvBujVihQLlMu0S6ImnfV692mHg==} +>>>>>>> e6d310e4e (update lockfile) peerDependencies: eslint: '>6.6.0' @@ -7306,6 +7328,26 @@ packages: resolution: {integrity: sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==} engines: {node: '>=10'} +<<<<<<< HEAD +||||||| parent of e6d310e4e (update lockfile) +<<<<<<< HEAD +||||||| parent of 1f4b8314e (first pass) + node-fetch-native@1.6.4: + resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} + +======= + node-addon-api@4.3.0: + resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} + + node-fetch-native@1.6.4: + resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==} + +>>>>>>> 1f4b8314e (first pass) +======= + node-addon-api@4.3.0: + resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==} + +>>>>>>> e6d310e4e (update lockfile) node-fetch@2.6.11: resolution: {integrity: sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==} engines: {node: 4.x || >=6.0.0} @@ -9085,8 +9127,30 @@ packages: engines: {node: '>=14.17'} hasBin: true +<<<<<<< HEAD + ufo@1.5.4: + resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} +||||||| parent of e6d310e4e (update lockfile) +<<<<<<< HEAD + ufo@1.5.4: + resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} +||||||| parent of 1f4b8314e (first pass) + ufo@1.5.3: + resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} +======= + uc.micro@1.0.6: + resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} + + ufo@1.5.3: + resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} +>>>>>>> 1f4b8314e (first pass) +======= + uc.micro@1.0.6: + resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} + ufo@1.5.4: resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} +>>>>>>> e6d310e4e (update lockfile) uglify-js@3.17.4: resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==} @@ -9110,6 +9174,7 @@ packages: resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==} engines: {node: '>=14.0'} +<<<<<<< HEAD <<<<<<< HEAD unenv-nightly@2.0.0-20240919-125358-9a64854: resolution: {integrity: sha512-XjsgUTrTHR7iw+k/SRTNjh6EQgwpC9voygnoCJo5kh4hKqsSDHUW84MhL9EsHTNfLctvVBHaSw8e2k3R2fKXsQ==} @@ -9124,14 +9189,33 @@ packages: unenv-nightly@1.10.0-1717606461.a117952: resolution: {integrity: sha512-u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==} ======= +||||||| parent of e6d310e4e (update lockfile) +<<<<<<< HEAD + unenv-nightly@2.0.0-1724863496.70db6f1: + resolution: {integrity: sha512-r+VIl1gnsI4WQxluruSQhy8alpAf1AsLRLm4sEKp3otCyTIVD6I6wHEYzeQnwsyWgaD4+3BD4A/eqrgOpdTzhw==} +||||||| parent of 1f4b8314e (first pass) + unenv-nightly@1.10.0-1717606461.a117952: + resolution: {integrity: sha512-u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==} +======= +======= +>>>>>>> e6d310e4e (update lockfile) undici@6.19.8: resolution: {integrity: sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==} engines: {node: '>=18.17'} +<<<<<<< HEAD unenv-nightly@1.10.0-1717606461.a117952: resolution: {integrity: sha512-u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==} >>>>>>> 1f4b8314e (first pass) >>>>>>> 3b59747bc (first pass) +||||||| parent of e6d310e4e (update lockfile) + unenv-nightly@1.10.0-1717606461.a117952: + resolution: {integrity: sha512-u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==} +>>>>>>> 1f4b8314e (first pass) +======= + unenv-nightly@2.0.0-1724863496.70db6f1: + resolution: {integrity: sha512-r+VIl1gnsI4WQxluruSQhy8alpAf1AsLRLm4sEKp3otCyTIVD6I6wHEYzeQnwsyWgaD4+3BD4A/eqrgOpdTzhw==} +>>>>>>> e6d310e4e (update lockfile) unicorn-magic@0.1.0: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} @@ -9758,7 +9842,7 @@ snapshots: '@babel/traverse': 7.22.20 '@babel/types': 7.22.19 convert-source-map: 1.8.0 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -9778,7 +9862,7 @@ snapshots: '@babel/traverse': 7.24.5 '@babel/types': 7.24.5 convert-source-map: 2.0.0 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -9986,7 +10070,7 @@ snapshots: '@babel/helper-split-export-declaration': 7.22.6 '@babel/parser': 7.22.16 '@babel/types': 7.22.19 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -10001,7 +10085,7 @@ snapshots: '@babel/helper-split-export-declaration': 7.24.5 '@babel/parser': 7.24.5 '@babel/types': 7.24.5 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -10797,7 +10881,7 @@ snapshots: '@eslint/eslintrc@2.1.2': dependencies: ajv: 6.12.6 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.5 espree: 9.6.1 globals: 13.20.0 ignore: 5.3.1 @@ -10811,7 +10895,7 @@ snapshots: '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -10836,7 +10920,7 @@ snapshots: '@humanwhocodes/config-array@0.11.11': dependencies: '@humanwhocodes/object-schema': 1.2.1 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.5 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -10844,7 +10928,7 @@ snapshots: '@humanwhocodes/config-array@0.11.14': dependencies: '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -10995,7 +11079,7 @@ snapshots: '@mapbox/node-pre-gyp@1.0.11(encoding@0.1.13)': dependencies: detect-libc: 2.0.2 - https-proxy-agent: 5.0.1(supports-color@9.2.2) + https-proxy-agent: 5.0.1 make-dir: 3.1.0 node-fetch: 2.6.11(encoding@0.1.13) nopt: 5.0.0 @@ -11956,7 +12040,7 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.4) '@typescript-eslint/visitor-keys': 7.18.0 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) eslint: 8.57.0 optionalDependencies: typescript: 5.5.4 @@ -11989,7 +12073,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 6.10.0(typescript@5.5.4) '@typescript-eslint/utils': 6.10.0(eslint@8.57.0)(typescript@5.5.4) - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.5 eslint: 8.57.0 ts-api-utils: 1.0.3(typescript@5.5.4) optionalDependencies: @@ -12001,7 +12085,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.5.4) '@typescript-eslint/utils': 7.18.0(eslint@8.57.0)(typescript@5.5.4) - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.5.4) optionalDependencies: @@ -12017,7 +12101,7 @@ snapshots: dependencies: '@typescript-eslint/types': 6.10.0 '@typescript-eslint/visitor-keys': 6.10.0 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 @@ -12031,7 +12115,7 @@ snapshots: dependencies: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.5 @@ -12165,6 +12249,7 @@ snapshots: pathe: 1.1.1 picocolors: 1.0.1 sirv: 2.0.4 +<<<<<<< HEAD <<<<<<< HEAD vitest: 2.1.1(@types/node@20.8.3)(@vitest/ui@1.6.0)(msw@2.3.0(typescript@5.5.4))(supports-color@9.2.2) ||||||| parent of 3b59747bc (first pass) @@ -12178,6 +12263,11 @@ snapshots: pretty-format: 29.7.0 ======= vitest: 1.6.0(@types/node@20.8.3)(@vitest/ui@1.6.0) +||||||| parent of e6d310e4e (update lockfile) + vitest: 1.6.0(@types/node@20.8.3)(@vitest/ui@1.6.0) +======= + vitest: 1.6.0(@types/node@20.12.12)(@vitest/ui@1.6.0)(supports-color@9.2.2) +>>>>>>> e6d310e4e (update lockfile) '@vitest/utils@1.5.0': dependencies: @@ -12346,12 +12436,24 @@ snapshots: acorn@8.11.3: {} + agent-base@6.0.2: + dependencies: + debug: 4.3.6(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + agent-base@6.0.2(supports-color@9.2.2): dependencies: debug: 4.3.6(supports-color@9.2.2) transitivePeerDependencies: - supports-color + agent-base@7.1.0: + dependencies: + debug: 4.3.6(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + agent-base@7.1.0(supports-color@9.2.2): dependencies: debug: 4.3.6(supports-color@9.2.2) @@ -12519,7 +12621,7 @@ snapshots: array.prototype.foreach@1.0.5: dependencies: call-bind: 1.0.2 - define-properties: 1.2.1 + define-properties: 1.2.0 es-abstract: 1.22.1 es-array-method-boxes-properly: 1.0.0 get-intrinsic: 1.2.1 @@ -12865,7 +12967,7 @@ snapshots: capnp-ts@0.5.1: dependencies: - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) format: 0.2.2 tslib: 2.5.3 utf8-encoding: 0.1.2 @@ -13858,6 +13960,7 @@ snapshots: dependencies: eslint: 8.57.0 +<<<<<<< HEAD <<<<<<< HEAD eslint-config-turbo@2.1.3(eslint@8.49.0): ||||||| parent of 3b59747bc (first pass) @@ -13865,8 +13968,14 @@ snapshots: ======= eslint-config-turbo@2.1.0(eslint@8.49.0): >>>>>>> 3b59747bc (first pass) +||||||| parent of e6d310e4e (update lockfile) + eslint-config-turbo@2.1.0(eslint@8.49.0): +======= + eslint-config-turbo@2.0.14(eslint@8.49.0): +>>>>>>> e6d310e4e (update lockfile) dependencies: eslint: 8.49.0 +<<<<<<< HEAD <<<<<<< HEAD eslint-plugin-turbo: 2.1.3(eslint@8.49.0) ||||||| parent of 3b59747bc (first pass) @@ -13874,6 +13983,11 @@ snapshots: ======= eslint-plugin-turbo: 2.1.0(eslint@8.49.0) >>>>>>> 3b59747bc (first pass) +||||||| parent of e6d310e4e (update lockfile) + eslint-plugin-turbo: 2.1.0(eslint@8.49.0) +======= + eslint-plugin-turbo: 2.0.14(eslint@8.49.0) +>>>>>>> e6d310e4e (update lockfile) eslint-import-resolver-node@0.3.7: dependencies: @@ -13990,6 +14104,7 @@ snapshots: semver: 6.3.1 string.prototype.matchall: 4.0.8 +<<<<<<< HEAD <<<<<<< HEAD eslint-plugin-turbo@2.1.3(eslint@8.49.0): ||||||| parent of 3b59747bc (first pass) @@ -13997,6 +14112,11 @@ snapshots: ======= eslint-plugin-turbo@2.1.0(eslint@8.49.0): >>>>>>> 3b59747bc (first pass) +||||||| parent of e6d310e4e (update lockfile) + eslint-plugin-turbo@2.1.0(eslint@8.49.0): +======= + eslint-plugin-turbo@2.0.14(eslint@8.49.0): +>>>>>>> e6d310e4e (update lockfile) dependencies: dotenv: 16.0.3 eslint: 8.49.0 @@ -14560,7 +14680,7 @@ snapshots: dependencies: basic-ftp: 5.0.3 data-uri-to-buffer: 5.0.1 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) fs-extra: 8.1.0 transitivePeerDependencies: - supports-color @@ -14679,7 +14799,7 @@ snapshots: gopd@1.0.1: dependencies: - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.1 got@12.6.1: dependencies: @@ -14809,15 +14929,15 @@ snapshots: http-proxy-agent@7.0.0: dependencies: - agent-base: 7.1.0(supports-color@9.2.2) - debug: 4.3.6(supports-color@9.2.2) + agent-base: 7.1.0 + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color http-proxy-agent@7.0.2: dependencies: - agent-base: 7.1.0(supports-color@9.2.2) - debug: 4.3.6(supports-color@9.2.2) + agent-base: 7.1.0 + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -14833,6 +14953,13 @@ snapshots: quick-lru: 5.1.1 resolve-alpn: 1.2.1 + https-proxy-agent@5.0.1: + dependencies: + agent-base: 6.0.2 + debug: 4.3.6(supports-color@8.1.1) + transitivePeerDependencies: + - supports-color + https-proxy-agent@5.0.1(supports-color@9.2.2): dependencies: agent-base: 6.0.2(supports-color@9.2.2) @@ -14840,6 +14967,13 @@ snapshots: transitivePeerDependencies: - supports-color + https-proxy-agent@7.0.2: + dependencies: + agent-base: 7.1.0 + debug: 4.3.4(supports-color@9.2.2) + transitivePeerDependencies: + - supports-color + https-proxy-agent@7.0.2(supports-color@9.2.2): dependencies: agent-base: 7.1.0(supports-color@9.2.2) @@ -14849,8 +14983,8 @@ snapshots: https-proxy-agent@7.0.5: dependencies: - agent-base: 7.1.0(supports-color@9.2.2) - debug: 4.3.6(supports-color@9.2.2) + agent-base: 7.1.0 + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -15118,7 +15252,7 @@ snapshots: is-nan@1.3.2: dependencies: call-bind: 1.0.2 - define-properties: 1.2.1 + define-properties: 1.2.0 is-negative-zero@2.0.2: {} @@ -15152,7 +15286,7 @@ snapshots: is-regex@1.1.4: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.2 has-tostringtag: 1.0.0 is-set@2.0.2: {} @@ -15207,7 +15341,7 @@ snapshots: is-weakref@1.0.2: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.2 is-weakset@2.0.2: dependencies: @@ -15929,7 +16063,7 @@ snapshots: object-is@1.1.5: dependencies: call-bind: 1.0.2 - define-properties: 1.2.1 + define-properties: 1.2.0 object-keys@1.1.1: {} @@ -16133,11 +16267,11 @@ snapshots: pac-proxy-agent@7.0.1: dependencies: '@tootallnate/quickjs-emscripten': 0.23.0 - agent-base: 7.1.0(supports-color@9.2.2) - debug: 4.3.6(supports-color@9.2.2) + agent-base: 7.1.0 + debug: 4.3.6(supports-color@8.1.1) get-uri: 6.0.1 http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.2(supports-color@9.2.2) + https-proxy-agent: 7.0.2 pac-resolver: 7.0.0 socks-proxy-agent: 8.0.2 transitivePeerDependencies: @@ -16492,10 +16626,10 @@ snapshots: proxy-agent@6.3.1: dependencies: - agent-base: 7.1.0(supports-color@9.2.2) - debug: 4.3.6(supports-color@9.2.2) + agent-base: 7.1.0 + debug: 4.3.6(supports-color@8.1.1) http-proxy-agent: 7.0.0 - https-proxy-agent: 7.0.2(supports-color@9.2.2) + https-proxy-agent: 7.0.2 lru-cache: 7.18.3 pac-proxy-agent: 7.0.1 proxy-from-env: 1.1.0 @@ -17140,8 +17274,8 @@ snapshots: socks-proxy-agent@8.0.2: dependencies: - agent-base: 7.1.0(supports-color@9.2.2) - debug: 4.3.6(supports-color@9.2.2) + agent-base: 7.1.0 + debug: 4.3.6(supports-color@8.1.1) socks: 2.7.1 transitivePeerDependencies: - supports-color @@ -17738,22 +17872,16 @@ snapshots: typescript@5.5.4: {} -<<<<<<< HEAD - ufo@1.5.4: {} -||||||| parent of 1f4b8314e (first pass) - ufo@1.5.3: {} -======= uc.micro@1.0.6: {} - ufo@1.5.3: {} ->>>>>>> 1f4b8314e (first pass) + ufo@1.5.4: {} uglify-js@3.17.4: optional: true unbox-primitive@1.0.2: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.2 has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 @@ -17770,6 +17898,7 @@ snapshots: dependencies: '@fastify/busboy': 2.1.1 +<<<<<<< HEAD <<<<<<< HEAD unenv-nightly@2.0.0-20240919-125358-9a64854: ||||||| parent of 3b59747bc (first pass) @@ -17780,11 +17909,26 @@ snapshots: ||||||| parent of 1f4b8314e (first pass) unenv-nightly@1.10.0-1717606461.a117952: ======= +||||||| parent of e6d310e4e (update lockfile) +<<<<<<< HEAD + unenv-nightly@2.0.0-1724863496.70db6f1: +||||||| parent of 1f4b8314e (first pass) + unenv-nightly@1.10.0-1717606461.a117952: +======= +======= +>>>>>>> e6d310e4e (update lockfile) undici@6.19.8: {} +<<<<<<< HEAD unenv-nightly@1.10.0-1717606461.a117952: >>>>>>> 1f4b8314e (first pass) >>>>>>> 3b59747bc (first pass) +||||||| parent of e6d310e4e (update lockfile) + unenv-nightly@1.10.0-1717606461.a117952: +>>>>>>> 1f4b8314e (first pass) +======= + unenv-nightly@2.0.0-1724863496.70db6f1: +>>>>>>> e6d310e4e (update lockfile) dependencies: defu: 6.1.4 ohash: 1.1.4 @@ -17895,10 +18039,98 @@ snapshots: vary@1.1.2: {} vite-node@2.1.1(@types/node@20.8.3)(supports-color@9.2.2): + dependencies: + cac: 6.7.14 + debug: 4.3.5 + pathe: 1.1.2 + vite: 5.0.12(@types/node@20.8.3) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + +<<<<<<< HEAD +||||||| parent of e6d310e4e (update lockfile) + vite-node@1.6.0(@types/node@20.12.12)(supports-color@9.2.2): + dependencies: + cac: 6.7.14 + debug: 4.3.6(supports-color@9.2.2) + pathe: 1.1.2 + picocolors: 1.0.1 + vite: 5.0.12(@types/node@20.12.12) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + + vite-node@1.6.0(@types/node@20.8.3): + dependencies: + cac: 6.7.14 + debug: 4.3.6(supports-color@9.2.2) + pathe: 1.1.2 + picocolors: 1.0.1 + vite: 5.0.12(@types/node@20.8.3) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + + vite-node@2.0.5(@types/node@20.12.12): + dependencies: + cac: 6.7.14 + debug: 4.3.6(supports-color@9.2.2) + pathe: 1.1.2 + tinyrainbow: 1.2.0 + vite: 5.0.12(@types/node@20.12.12) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + +======= + vite-node@1.6.0(@types/node@20.12.12)(supports-color@9.2.2): dependencies: cac: 6.7.14 debug: 4.3.6(supports-color@9.2.2) pathe: 1.1.2 + picocolors: 1.0.1 + vite: 5.0.12(@types/node@20.12.12) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + + vite-node@1.6.0(@types/node@20.8.3): + dependencies: + cac: 6.7.14 + debug: 4.3.6(supports-color@8.1.1) + pathe: 1.1.2 + picocolors: 1.0.1 vite: 5.0.12(@types/node@20.8.3) transitivePeerDependencies: - '@types/node' @@ -17910,6 +18142,24 @@ snapshots: - supports-color - terser + vite-node@2.0.5(@types/node@20.12.12): + dependencies: + cac: 6.7.14 + debug: 4.3.6(supports-color@8.1.1) + pathe: 1.1.2 + tinyrainbow: 1.2.0 + vite: 5.0.12(@types/node@20.12.12) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + +>>>>>>> e6d310e4e (update lockfile) vite-plugin-dts@4.0.1(@types/node@20.12.12)(rollup@4.9.6)(typescript@5.5.4)(vite@5.0.12(@types/node@20.12.12)): dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@20.12.12) @@ -17917,7 +18167,7 @@ snapshots: '@volar/typescript': 2.3.4 '@vue/language-core': 2.0.29(typescript@5.5.4) compare-versions: 6.1.1 - debug: 4.3.6(supports-color@9.2.2) + debug: 4.3.6(supports-color@8.1.1) kolorist: 1.8.0 local-pkg: 0.5.0 magic-string: 0.30.11 @@ -17980,7 +18230,15 @@ snapshots: '@vitest/spy': 2.1.1 '@vitest/utils': 2.1.1 chai: 5.1.1 +<<<<<<< HEAD + debug: 4.3.6(supports-color@9.2.2) +||||||| parent of e6d310e4e (update lockfile) debug: 4.3.6(supports-color@9.2.2) + execa: 8.0.1 +======= + debug: 4.3.6(supports-color@8.1.1) + execa: 8.0.1 +>>>>>>> e6d310e4e (update lockfile) magic-string: 0.30.11 pathe: 1.1.2 std-env: 3.7.0