From 95d7afbf6e96f8d559428ef69672a6bb4fde28d5 Mon Sep 17 00:00:00 2001 From: Samuel Macleod Date: Tue, 21 Jan 2025 18:18:01 +0000 Subject: [PATCH] fix lockfile --- pnpm-lock.yaml | 356 +------------------------------------------------ 1 file changed, 1 insertion(+), 355 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 151006706f68..2c4f99c83e5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1225,42 +1225,10 @@ importers: version: 5.0.12(@types/node@18.19.71) vite-tsconfig-paths: specifier: ^4.0.8 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -||||||| parent of 47ba5eb3a (fix lockfile) -<<<<<<< HEAD - version: 4.2.0(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.59)) -||||||| e8aaa3930 - version: 4.2.0(typescript@5.6.3)(vite@5.0.12(@types/node@18.19.59)) -======= -======= ->>>>>>> 47ba5eb3a (fix lockfile) - version: 4.2.0(typescript@5.6.3)(vite@5.0.12(@types/node@18.19.59)) -||||||| parent of 851ee8a1d (Update TS) - version: 4.2.0(typescript@5.6.3)(vite@5.0.12(@types/node@18.19.59)) -======= version: 4.2.0(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.71)) ->>>>>>> 851ee8a1d (Update TS) vitest: specifier: catalog:default -<<<<<<< HEAD - version: 2.1.8(@types/node@18.19.59)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.6.3))(supports-color@9.2.2) -<<<<<<< HEAD -||||||| parent of 5f6745796 (initial commit) - version: 4.2.0(typescript@5.6.3)(vite@5.0.12(@types/node@18.19.59)) -======= - version: 4.2.0(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.59)) ->>>>>>> 5f6745796 (initial commit) -||||||| parent of 47ba5eb3a (fix lockfile) ->>>>>>> origin/main -======= ->>>>>>> 47ba5eb3a (fix lockfile) -||||||| parent of 851ee8a1d (Update TS) - version: 2.1.8(@types/node@18.19.59)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.6.3))(supports-color@9.2.2) -======= version: 2.1.8(@types/node@18.19.71)(@vitest/ui@2.1.8)(msw@2.4.3(typescript@5.7.3))(supports-color@9.2.2) ->>>>>>> 851ee8a1d (Update TS) which-pm-runs: specifier: ^1.1.0 version: 1.1.0 @@ -10365,19 +10333,6 @@ packages: engines: {node: '>=14.17'} hasBin: true -<<<<<<< HEAD -<<<<<<< HEAD - typescript@5.7.3: - resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} - engines: {node: '>=14.17'} - hasBin: true - -||||||| parent of 5f6745796 (initial commit) -======= -||||||| parent of 47ba5eb3a (fix lockfile) -<<<<<<< HEAD -======= ->>>>>>> 47ba5eb3a (fix lockfile) typescript@5.7.2: resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} engines: {node: '>=14.17'} @@ -10388,19 +10343,6 @@ packages: engines: {node: '>=14.17'} hasBin: true -<<<<<<< HEAD ->>>>>>> 5f6745796 (initial commit) -||||||| parent of 47ba5eb3a (fix lockfile) -||||||| e8aaa3930 -======= - typescript@5.7.3: - resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} - engines: {node: '>=14.17'} - hasBin: true - ->>>>>>> origin/main -======= ->>>>>>> 47ba5eb3a (fix lockfile) uc.micro@1.0.6: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} @@ -17433,7 +17375,7 @@ snapshots: '@cspotcode/source-map-support': 0.8.1 acorn: 8.14.0 acorn-walk: 8.3.2 - capnp-ts: 0.7.0(patch_hash=l4yimnxyvkiyj6alnps2ec3sii) + capnp-ts: 0.7.0 exit-hook: 2.2.1 glob-to-regexp: 0.4.1 stoppable: 1.1.0 @@ -19646,30 +19588,10 @@ snapshots: typescript@5.6.3: {} -<<<<<<< HEAD -<<<<<<< HEAD - typescript@5.7.3: {} - -||||||| parent of 5f6745796 (initial commit) -======= -||||||| parent of 47ba5eb3a (fix lockfile) -<<<<<<< HEAD -======= ->>>>>>> 47ba5eb3a (fix lockfile) typescript@5.7.2: {} typescript@5.7.3: {} -<<<<<<< HEAD ->>>>>>> 5f6745796 (initial commit) -||||||| parent of 47ba5eb3a (fix lockfile) -||||||| e8aaa3930 -======= - typescript@5.7.3: {} - ->>>>>>> origin/main -======= ->>>>>>> 47ba5eb3a (fix lockfile) uc.micro@1.0.6: {} ufo@1.5.4: {} @@ -19880,101 +19802,7 @@ snapshots: - supports-color - terser -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -||||||| parent of 47ba5eb3a (fix lockfile) -<<<<<<< HEAD - vite-node@2.1.8(@types/node@22.10.6): - dependencies: - cac: 6.7.14 - debug: 4.3.7(supports-color@8.1.1) - es-module-lexer: 1.5.4 - pathe: 1.1.2 - vite: 5.0.12(@types/node@22.10.6) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - -======= ->>>>>>> 47ba5eb3a (fix lockfile) - vite-plugin-dts@4.0.1(@types/node@18.19.59)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.59)): -<<<<<<< HEAD -||||||| parent of 5f6745796 (initial commit) - vite-node@2.1.8(@types/node@22.10.6): - dependencies: - cac: 6.7.14 - debug: 4.3.7(supports-color@9.2.2) - es-module-lexer: 1.5.4 - pathe: 1.1.2 - vite: 5.0.12(@types/node@22.10.6) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - - vite-plugin-dts@4.0.1(@types/node@18.19.59)(rollup@4.30.1)(typescript@5.6.3)(vite@5.0.12(@types/node@18.19.59)): -======= - vite-node@2.1.8(@types/node@22.10.6): - dependencies: - cac: 6.7.14 - debug: 4.3.7(supports-color@8.1.1) - es-module-lexer: 1.5.4 - pathe: 1.1.2 - vite: 5.0.12(@types/node@22.10.6) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - - vite-plugin-dts@4.0.1(@types/node@18.19.59)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.59)): ->>>>>>> 5f6745796 (initial commit) -||||||| parent of 47ba5eb3a (fix lockfile) -||||||| e8aaa3930 - vite-node@2.1.8(@types/node@22.10.6): - dependencies: - cac: 6.7.14 - debug: 4.3.7(supports-color@9.2.2) - es-module-lexer: 1.5.4 - pathe: 1.1.2 - vite: 5.0.12(@types/node@22.10.6) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - - vite-plugin-dts@4.0.1(@types/node@18.19.59)(rollup@4.30.1)(typescript@5.6.3)(vite@5.0.12(@types/node@18.19.59)): -======= - vite-plugin-dts@4.0.1(@types/node@18.19.59)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.59)): ->>>>>>> origin/main -======= ->>>>>>> 47ba5eb3a (fix lockfile) -||||||| parent of 851ee8a1d (Update TS) - vite-plugin-dts@4.0.1(@types/node@18.19.59)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.59)): -======= vite-plugin-dts@4.0.1(@types/node@18.19.71)(rollup@4.30.1)(typescript@5.7.3)(vite@5.0.12(@types/node@18.19.71)): ->>>>>>> 851ee8a1d (Update TS) dependencies: '@microsoft/api-extractor': 7.47.4(@types/node@18.19.71) '@rollup/pluginutils': 5.1.0(rollup@4.30.1) @@ -19984,39 +19812,9 @@ snapshots: debug: 4.3.7(supports-color@9.2.2) kolorist: 1.8.0 local-pkg: 0.5.0 -<<<<<<< HEAD -<<<<<<< HEAD magic-string: 0.30.17 typescript: 5.7.3 vue-tsc: 2.0.29(typescript@5.7.3) -||||||| parent of 5f6745796 (initial commit) - magic-string: 0.30.14 - typescript: 5.6.3 - vue-tsc: 2.0.29(typescript@5.6.3) -======= - magic-string: 0.30.14 -||||||| parent of 47ba5eb3a (fix lockfile) -<<<<<<< HEAD - magic-string: 0.30.14 - typescript: 5.7.3 - vue-tsc: 2.0.29(typescript@5.7.3) -||||||| e8aaa3930 - magic-string: 0.30.14 - typescript: 5.6.3 - vue-tsc: 2.0.29(typescript@5.6.3) -======= - magic-string: 0.30.17 -======= - magic-string: 0.30.17 ->>>>>>> 47ba5eb3a (fix lockfile) - typescript: 5.7.3 - vue-tsc: 2.0.29(typescript@5.7.3) -<<<<<<< HEAD ->>>>>>> 5f6745796 (initial commit) -||||||| parent of 47ba5eb3a (fix lockfile) ->>>>>>> origin/main -======= ->>>>>>> 47ba5eb3a (fix lockfile) optionalDependencies: vite: 5.0.12(@types/node@18.19.71) transitivePeerDependencies: @@ -20095,158 +19893,6 @@ snapshots: - supports-color - terser -<<<<<<< HEAD -<<<<<<< HEAD -||||||| parent of 5f6745796 (initial commit) - vitest@2.1.8(@types/node@22.10.6)(@vitest/ui@2.1.8): - dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.4.3(typescript@5.6.3))(vite@5.0.12(@types/node@18.19.59)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - debug: 4.3.7(supports-color@9.2.2) - expect-type: 1.1.0 - magic-string: 0.30.14 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.1 - tinypool: 1.0.1 - tinyrainbow: 1.2.0 - vite: 5.0.12(@types/node@22.10.6) - vite-node: 2.1.8(@types/node@22.10.6) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.6 - '@vitest/ui': 2.1.8(vitest@2.1.8) - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - stylus - - sugarss - - supports-color - - terser - -======= - vitest@2.1.8(@types/node@22.10.6)(@vitest/ui@2.1.8): - dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.4.3(typescript@5.7.3))(vite@5.0.12(@types/node@18.19.59)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - debug: 4.3.7(supports-color@8.1.1) - expect-type: 1.1.0 - magic-string: 0.30.14 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.1 - tinypool: 1.0.1 - tinyrainbow: 1.2.0 - vite: 5.0.12(@types/node@22.10.6) - vite-node: 2.1.8(@types/node@22.10.6) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.6 - '@vitest/ui': 2.1.8(vitest@2.1.8) - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - stylus - - sugarss - - supports-color - - terser - ->>>>>>> 5f6745796 (initial commit) -||||||| parent of 47ba5eb3a (fix lockfile) -<<<<<<< HEAD - vitest@2.1.8(@types/node@22.10.6)(@vitest/ui@2.1.8): - dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.4.3(typescript@5.7.3))(vite@5.0.12(@types/node@18.19.59)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - debug: 4.3.7(supports-color@8.1.1) - expect-type: 1.1.0 - magic-string: 0.30.14 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.1 - tinypool: 1.0.1 - tinyrainbow: 1.2.0 - vite: 5.0.12(@types/node@22.10.6) - vite-node: 2.1.8(@types/node@22.10.6) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.6 - '@vitest/ui': 2.1.8(vitest@2.1.8) - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - stylus - - sugarss - - supports-color - - terser - -||||||| e8aaa3930 - vitest@2.1.8(@types/node@22.10.6)(@vitest/ui@2.1.8): - dependencies: - '@vitest/expect': 2.1.8 - '@vitest/mocker': 2.1.8(msw@2.4.3(typescript@5.6.3))(vite@5.0.12(@types/node@18.19.59)) - '@vitest/pretty-format': 2.1.8 - '@vitest/runner': 2.1.8 - '@vitest/snapshot': 2.1.8 - '@vitest/spy': 2.1.8 - '@vitest/utils': 2.1.8 - chai: 5.1.2 - debug: 4.3.7(supports-color@9.2.2) - expect-type: 1.1.0 - magic-string: 0.30.14 - pathe: 1.1.2 - std-env: 3.8.0 - tinybench: 2.9.0 - tinyexec: 0.3.1 - tinypool: 1.0.1 - tinyrainbow: 1.2.0 - vite: 5.0.12(@types/node@22.10.6) - vite-node: 2.1.8(@types/node@22.10.6) - why-is-node-running: 2.3.0 - optionalDependencies: - '@types/node': 22.10.6 - '@vitest/ui': 2.1.8(vitest@2.1.8) - transitivePeerDependencies: - - less - - lightningcss - - msw - - sass - - stylus - - sugarss - - supports-color - - terser - -======= ->>>>>>> origin/main -======= ->>>>>>> 47ba5eb3a (fix lockfile) vsce@2.15.0: dependencies: azure-devops-node-api: 11.2.0