From a9f8dbfb8d33009f0dc7d0b48a24116019f7b46c Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Tue, 9 Dec 2025 16:51:12 +0000 Subject: [PATCH] Latest lockfile --- pnpm-lock.yaml | 261 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 212 insertions(+), 49 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cba37a57c..48f6af885 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -696,6 +696,7 @@ importers: remix-auth-github: specifier: ^1.6.0 <<<<<<< ours +<<<<<<< ours <<<<<<< ours version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) ||||||| ancestor @@ -707,9 +708,17 @@ importers: <<<<<<< ours >>>>>>> theirs version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +>>>>>>> theirs +||||||| ancestor +<<<<<<< ours +<<<<<<< ours + version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +======= + version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) >>>>>>> theirs remix-auth-google: specifier: ^2.0.0 +<<<<<<< ours <<<<<<< ours version: 2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) ||||||| ancestor @@ -730,6 +739,21 @@ importers: ======= version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) >>>>>>> theirs +>>>>>>> theirs +||||||| ancestor + version: 2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +||||||| ancestor + version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) +======= + version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +>>>>>>> theirs +||||||| ancestor + version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +======= + version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) +>>>>>>> theirs +======= + version: 2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) >>>>>>> theirs remix-typedjson: specifier: 0.3.1 @@ -5839,7 +5863,6 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] -<<<<<<< ours libc: [glibc] '@next/swc-linux-arm64-gnu@15.4.8': @@ -5848,10 +5871,6 @@ packages: cpu: [arm64] os: [linux] libc: [glibc] -||||||| ancestor -======= - libc: [glibc] ->>>>>>> theirs '@next/swc-linux-arm64-gnu@15.5.6': resolution: {integrity: sha512-qvz4SVKQ0P3/Im9zcS2RmfFL/UCQnsJKJwQSkissbngnB/12c6bZTCB0gHTexz1s6d/mD0+egPKXAIRFVS7hQg==} @@ -5879,7 +5898,6 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] -<<<<<<< ours libc: [musl] '@next/swc-linux-arm64-musl@15.4.8': @@ -5888,10 +5906,6 @@ packages: cpu: [arm64] os: [linux] libc: [musl] -||||||| ancestor -======= - libc: [musl] ->>>>>>> theirs '@next/swc-linux-arm64-musl@15.5.6': resolution: {integrity: sha512-FsbGVw3SJz1hZlvnWD+T6GFgV9/NYDeLTNQB2MXoPN5u9VA9OEDy6fJEfePfsUKAhJufFbZLgp0cPxMuV6SV0w==} @@ -5919,7 +5933,6 @@ packages: engines: {node: '>= 10'} cpu: [x64] os: [linux] -<<<<<<< ours libc: [glibc] '@next/swc-linux-x64-gnu@15.4.8': @@ -5928,10 +5941,6 @@ packages: cpu: [x64] os: [linux] libc: [glibc] -||||||| ancestor -======= - libc: [glibc] ->>>>>>> theirs '@next/swc-linux-x64-gnu@15.5.6': resolution: {integrity: sha512-3QnHGFWlnvAgyxFxt2Ny8PTpXtQD7kVEeaFat5oPAHHI192WKYB+VIKZijtHLGdBBvc16tiAkPTDmQNOQ0dyrA==} @@ -5959,7 +5968,6 @@ packages: engines: {node: '>= 10'} cpu: [x64] os: [linux] -<<<<<<< ours libc: [musl] '@next/swc-linux-x64-musl@15.4.8': @@ -5968,10 +5976,6 @@ packages: cpu: [x64] os: [linux] libc: [musl] -||||||| ancestor -======= - libc: [musl] ->>>>>>> theirs '@next/swc-linux-x64-musl@15.5.6': resolution: {integrity: sha512-OsGX148sL+TqMK9YFaPFPoIaJKbFJJxFzkXZljIgA9hjMjdruKht6xDCEv1HLtlLNfkx3c5w2GLKhj7veBQizQ==} @@ -9486,16 +9490,11 @@ packages: '@smithy/core@3.18.3': resolution: {integrity: sha512-qqpNskkbHOSfrbFbjhYj5o8VMXO26fvN1K/+HbCzUNlTuxgNcPRouUDNm+7D6CkN244WG7aK533Ne18UtJEgAA==} engines: {node: '>=18.0.0'} -<<<<<<< ours deprecated: Please upgrade your lockfile to use the latest 3.x version of @smithy/core for various fixes, see https://github.com/smithy-lang/smithy-typescript/blob/main/packages/core/CHANGELOG.md '@smithy/core@3.18.5': resolution: {integrity: sha512-6gnIz3h+PEPQGDj8MnRSjDvKBah042jEoPgjFGJ4iJLBE78L4lY/n98x14XyPF4u3lN179Ub/ZKFY5za9GeLQw==} engines: {node: '>=18.0.0'} -||||||| ancestor -======= - deprecated: Please upgrade your lockfile to use the latest 3.x version of @smithy/core for various fixes, see https://github.com/smithy-lang/smithy-typescript/blob/main/packages/core/CHANGELOG.md ->>>>>>> theirs '@smithy/core@3.6.0': resolution: {integrity: sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg==} @@ -29051,6 +29050,7 @@ snapshots: '@rushstack/eslint-patch@1.2.0': {} +<<<<<<< ours <<<<<<< ours <<<<<<< ours '@s2-dev/streamstore@0.17.3(typescript@5.9.3)': @@ -29063,36 +29063,21 @@ snapshots: ======= <<<<<<< ours '@s2-dev/streamstore@0.17.3(typescript@5.5.4)': +>>>>>>> theirs +||||||| ancestor +<<<<<<< ours +<<<<<<< ours + '@s2-dev/streamstore@0.17.3(typescript@5.5.4)': +======= + '@s2-dev/streamstore@0.17.3(typescript@5.9.3)': >>>>>>> theirs dependencies: '@protobuf-ts/runtime': 2.11.1 typescript: 5.9.3 '@s2-dev/streamstore@0.17.6': -||||||| ancestor - '@s2-dev/streamstore@0.17.3(typescript@5.9.3)': -======= - '@s2-dev/streamstore@0.17.3(typescript@5.5.4)': ->>>>>>> theirs -||||||| ancestor - '@s2-dev/streamstore@0.17.3(typescript@5.5.4)': -======= - '@s2-dev/streamstore@0.17.3(typescript@5.9.3)': ->>>>>>> theirs dependencies: '@protobuf-ts/runtime': 2.11.1 -<<<<<<< ours -<<<<<<< ours -||||||| ancestor - typescript: 5.9.3 -======= - typescript: 5.5.4 ->>>>>>> theirs -||||||| ancestor - typescript: 5.5.4 -======= - typescript: 5.9.3 ->>>>>>> theirs '@sec-ant/readable-stream@0.4.1': {} @@ -32874,6 +32859,7 @@ snapshots: dependencies: layout-base: 2.0.1 +<<<<<<< ours <<<<<<< ours <<<<<<< ours ||||||| ancestor @@ -32929,6 +32915,44 @@ snapshots: ======= >>>>>>> theirs +>>>>>>> theirs +||||||| ancestor +<<<<<<< ours +<<<<<<< ours + cosmiconfig@8.3.6(typescript@5.5.4): + dependencies: + import-fresh: 3.3.0 + js-yaml: 4.1.1 + parse-json: 5.2.0 + path-type: 4.0.0 + optionalDependencies: + typescript: 5.5.4 + +||||||| ancestor +======= + cosmiconfig@8.3.6(typescript@5.5.4): + dependencies: + import-fresh: 3.3.0 + js-yaml: 4.1.0 + parse-json: 5.2.0 + path-type: 4.0.0 + optionalDependencies: + typescript: 5.5.4 + +>>>>>>> theirs +||||||| ancestor + cosmiconfig@8.3.6(typescript@5.5.4): + dependencies: + import-fresh: 3.3.0 + js-yaml: 4.1.0 + parse-json: 5.2.0 + path-type: 4.0.0 + optionalDependencies: + typescript: 5.5.4 + +======= +>>>>>>> theirs +======= >>>>>>> theirs cosmiconfig@8.3.6(typescript@5.9.3): dependencies: @@ -35216,6 +35240,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< ours <<<<<<< ours ||||||| ancestor graphile-worker@0.16.6(patch_hash=798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1)(typescript@5.5.4): @@ -35286,6 +35311,25 @@ snapshots: - supports-color - typescript +======= +>>>>>>> theirs +||||||| ancestor + graphile-worker@0.16.6(patch_hash=798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1)(typescript@5.5.4): + dependencies: + '@graphile/logger': 0.2.0 + '@types/debug': 4.1.12 + '@types/pg': 8.11.6 + cosmiconfig: 8.3.6(typescript@5.5.4) + graphile-config: 0.0.1-beta.8 + json5: 2.2.3 + pg: 8.11.5 + tslib: 2.6.2 + yargs: 17.7.2 + transitivePeerDependencies: + - pg-native + - supports-color + - typescript + ======= >>>>>>> theirs graphile-worker@0.16.6(patch_hash=798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1)(typescript@5.9.3): @@ -39680,6 +39724,7 @@ snapshots: transitivePeerDependencies: - supports-color +<<<<<<< ours <<<<<<< ours <<<<<<< ours remix-auth-google@2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))): @@ -39697,8 +39742,21 @@ snapshots: ======= remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))): >>>>>>> theirs +>>>>>>> theirs +||||||| ancestor +<<<<<<< ours +<<<<<<< ours + remix-auth-google@2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))): +||||||| ancestor + remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))): +======= + remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))): +>>>>>>> theirs +======= + remix-auth-google@2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))): >>>>>>> theirs dependencies: +<<<<<<< ours <<<<<<< ours '@remix-run/server-runtime': 2.1.0(typescript@5.9.3) remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3)) @@ -39712,10 +39770,21 @@ snapshots: '@remix-run/server-runtime': 2.1.0(typescript@5.5.4) remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)) remix-auth-oauth2: 1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +>>>>>>> theirs +||||||| ancestor +<<<<<<< ours + '@remix-run/server-runtime': 2.1.0(typescript@5.5.4) + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)) + remix-auth-oauth2: 1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))) +======= + '@remix-run/server-runtime': 2.1.0(typescript@5.9.3) + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3)) + remix-auth-oauth2: 1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))) >>>>>>> theirs transitivePeerDependencies: - supports-color +<<<<<<< ours <<<<<<< ours remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))): ||||||| ancestor @@ -39725,10 +39794,23 @@ snapshots: ||||||| ancestor remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))): ======= - remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))): +||||||| ancestor + remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))): +||||||| ancestor + remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))): +======= +======= >>>>>>> theirs + remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.9.3))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))): +<<<<<<< ours +>>>>>>> theirs +>>>>>>> theirs +||||||| ancestor +>>>>>>> theirs +======= >>>>>>> theirs dependencies: +<<<<<<< ours <<<<<<< ours '@remix-run/server-runtime': 2.1.0(typescript@5.9.3) ||||||| ancestor @@ -39753,7 +39835,24 @@ snapshots: ||||||| ancestor '@remix-run/server-runtime': 2.1.0(typescript@5.5.4) ======= +||||||| ancestor +<<<<<<< ours + '@remix-run/server-runtime': 2.1.0(typescript@5.5.4) + debug: 4.4.1(supports-color@10.0.0) + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)) +||||||| ancestor '@remix-run/server-runtime': 2.1.0(typescript@5.9.3) + debug: 4.4.0 + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3)) +======= + '@remix-run/server-runtime': 2.1.0(typescript@5.5.4) +||||||| ancestor + '@remix-run/server-runtime': 2.1.0(typescript@5.5.4) +======= +======= +>>>>>>> theirs + '@remix-run/server-runtime': 2.1.0(typescript@5.9.3) +<<<<<<< ours >>>>>>> theirs debug: 4.4.0 <<<<<<< ours @@ -39766,8 +39865,25 @@ snapshots: ||||||| ancestor remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)) ======= - remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3)) +||||||| ancestor >>>>>>> theirs + debug: 4.4.0 +<<<<<<< ours + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)) +>>>>>>> theirs +||||||| ancestor + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)) +======= +======= + debug: 4.4.1(supports-color@10.0.0) +>>>>>>> theirs + remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3)) +<<<<<<< ours +>>>>>>> theirs +>>>>>>> theirs +||||||| ancestor +>>>>>>> theirs +======= >>>>>>> theirs transitivePeerDependencies: - supports-color @@ -41980,6 +42096,7 @@ snapshots: - supports-color - typescript +<<<<<<< ours <<<<<<< ours <<<<<<< ours vite-tsconfig-paths@4.0.5(typescript@5.9.3): @@ -42022,6 +42139,10 @@ snapshots: ======= ||||||| ancestor ======= +||||||| ancestor +<<<<<<< ours +<<<<<<< ours +||||||| ancestor vite-tsconfig-paths@4.0.5(typescript@5.9.3): dependencies: debug: 4.3.7(supports-color@10.0.0) @@ -42031,6 +42152,32 @@ snapshots: - supports-color - typescript + vite@4.1.4(@types/node@20.14.14)(terser@5.44.1): + dependencies: + esbuild: 0.16.17 + postcss: 8.5.3 + resolve: 1.22.8 + rollup: 3.10.0 + optionalDependencies: + '@types/node': 20.14.14 + fsevents: 2.3.3 + terser: 5.44.1 + +======= +||||||| ancestor +======= +======= +>>>>>>> theirs + vite-tsconfig-paths@4.0.5(typescript@5.9.3): + dependencies: + debug: 4.3.7(supports-color@10.0.0) + globrex: 0.1.2 + tsconfck: 2.1.2(typescript@5.9.3) + transitivePeerDependencies: + - supports-color + - typescript + +<<<<<<< ours >>>>>>> theirs vite@4.1.4(@types/node@20.14.14)(terser@5.44.1): dependencies: @@ -42044,6 +42191,22 @@ snapshots: terser: 5.44.1 >>>>>>> theirs +>>>>>>> theirs +||||||| ancestor +>>>>>>> theirs + vite@4.1.4(@types/node@20.14.14)(terser@5.44.1): + dependencies: + esbuild: 0.16.17 + postcss: 8.5.3 + resolve: 1.22.8 + rollup: 3.10.0 + optionalDependencies: + '@types/node': 20.14.14 + fsevents: 2.3.3 + terser: 5.44.1 + +>>>>>>> theirs +======= >>>>>>> theirs vite@4.4.9(@types/node@22.13.9)(lightningcss@1.29.2)(terser@5.44.1): dependencies: