github-featured/triggerdotdev--trigger.dev
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Latest lockfile

Browse Source
This commit is contained in:
Matt Aitken
2025-12-15 16:55:25 +00:00
parent aade98d11b
commit 8809e1be79
1 changed files with 0 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pnpm-lock.yaml
Generated
-514
View File
@@ -695,66 +695,10 @@ importers:
version: 2.0.2(@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-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
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)))
=======
<<<<<<< ours
||||||| ancestor
=======
<<<<<<< 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
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)))
=======
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
<<<<<<< ours
>>>>>>> theirs
||||||| ancestor
=======
||||||| 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
>>>>>>> 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
version: 0.3.1(@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))(react@18.2.0)
@@ -29050,27 +28994,7 @@ snapshots:
'@rushstack/eslint-patch@1.2.0': {}
<<<<<<< ours
<<<<<<< ours
<<<<<<< ours
'@s2-dev/streamstore@0.17.3(typescript@5.9.3)':
||||||| ancestor
||||||| ancestor
=======
<<<<<<< ours
>>>>>>> theirs
'@s2-dev/streamstore@0.17.3(typescript@5.5.4)':
=======
<<<<<<< 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
@@ -32859,101 +32783,6 @@ snapshots:
dependencies:
layout-base: 2.0.1
<<<<<<< ours
<<<<<<< ours
<<<<<<< ours
||||||| ancestor
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
=======
<<<<<<< ours
||||||| ancestor
=======
<<<<<<< ours
>>>>>>> theirs
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
<<<<<<< ours
>>>>>>> theirs
||||||| ancestor
=======
||||||| 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
||||||| 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:
import-fresh: 3.3.0
@@ -35240,98 +35069,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
<<<<<<< ours
<<<<<<< ours
||||||| 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
=======
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
<<<<<<< ours
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
||||||| 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
||||||| 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):
dependencies:
'@graphile/logger': 0.2.0
@@ -39724,167 +39461,19 @@ 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))):
||||||| ancestor
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))):
=======
<<<<<<< ours
||||||| ancestor
=======
<<<<<<< ours
>>>>>>> theirs
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
>>>>>>> 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))
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-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)))
=======
<<<<<<< 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)))
>>>>>>> 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
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.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))):
=======
||||||| 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
'@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
=======
<<<<<<< ours
'@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
>>>>>>> theirs
debug: 4.4.1(supports-color@10.0.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.9.3))(@remix-run/server-runtime@2.1.0(typescript@5.9.3))
||||||| 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.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)
=======
||||||| 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
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
<<<<<<< ours
>>>>>>> theirs
||||||| ancestor
=======
||||||| 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))
=======
||||||| 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
@@ -42096,9 +41685,6 @@ snapshots:
- supports-color
- typescript
<<<<<<< ours
<<<<<<< ours
<<<<<<< ours
vite-tsconfig-paths@4.0.5(typescript@5.9.3):
dependencies:
debug: 4.3.7(supports-color@10.0.0)
@@ -42108,106 +41694,6 @@ snapshots:
- supports-color
- typescript
||||||| ancestor
=======
<<<<<<< ours
||||||| ancestor
=======
<<<<<<< ours
>>>>>>> theirs
||||||| ancestor
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
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
=======
||||||| ancestor
<<<<<<< ours
<<<<<<< ours
||||||| ancestor
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
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:
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
||||||| 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:
esbuild: 0.18.11