Skip to content

Commit dd96017

Browse files
masterkainqwencoder
andcommitted
Resolve merge conflicts: keep Biome setup over ESLint
Co-authored-by: Qwen-Coder <[email protected]>
2 parents a409c09 + 6518b92 commit dd96017

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"@ai-sdk/openai": "1.3.24",
2323
"@airbrake/browser": "2.1.9",
2424
"@airbrake/node": "2.1.9",
25-
"@auth/prisma-adapter": "2.10.0",
25+
"@auth/prisma-adapter": "2.11.0",
2626
"@headlessui/react": "2.2.9",
2727
"@microlink/react-json-view": "1.27.0",
28-
"@prisma/client": "6.16.2",
28+
"@prisma/client": "6.17.1",
2929
"ai": "4.3.19",
30-
"chart.js": "4.5.0",
30+
"chart.js": "4.5.1",
3131
"clsx": "2.1.1",
3232
"date-fns": "4.1.0",
3333
"nanoid": "5.1.6",
@@ -47,7 +47,7 @@
4747
"@faker-js/faker": "9.9.0",
4848
"@testing-library/dom": "^10.4.0",
4949
"@testing-library/react": "^16.3.0",
50-
"@types/node": "22.18.6",
50+
"@types/node": "22.18.11",
5151
"@types/react": "19.1.15",
5252
"@types/react-dom": "19.1.9",
5353
"@types/react-syntax-highlighter": "^15.5.13",

yarn.lock

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ __metadata:
142142
languageName: node
143143
linkType: hard
144144

145-
"@auth/core@npm:0.40.0":
146-
version: 0.40.0
147-
resolution: "@auth/core@npm:0.40.0"
145+
"@auth/core@npm:0.41.0":
146+
version: 0.41.0
147+
resolution: "@auth/core@npm:0.41.0"
148148
dependencies:
149149
"@panva/hkdf": "npm:^1.2.1"
150150
jose: "npm:^6.0.6"
@@ -162,18 +162,18 @@ __metadata:
162162
optional: true
163163
nodemailer:
164164
optional: true
165-
checksum: 10c0/25cd12f22611eedc21c17dc1908fa9428ae5f0e32eb32c1ab009642276c37099cce58f49ffbb7f8e8d6d6488d5101a24fb9808ec662eee5aca19d520750acaa3
165+
checksum: 10c0/2971dc78b12cb00774fa4a82105d0302b7e2d96e416336f119e7e90604878bde26fca16c5c53dc027ecb47cecffb0d1471397cd5d8aedb85a8cd4b41c742379c
166166
languageName: node
167167
linkType: hard
168168

169-
"@auth/prisma-adapter@npm:2.10.0":
170-
version: 2.10.0
171-
resolution: "@auth/prisma-adapter@npm:2.10.0"
169+
"@auth/prisma-adapter@npm:2.11.0":
170+
version: 2.11.0
171+
resolution: "@auth/prisma-adapter@npm:2.11.0"
172172
dependencies:
173-
"@auth/core": "npm:0.40.0"
173+
"@auth/core": "npm:0.41.0"
174174
peerDependencies:
175175
"@prisma/client": ">=2.26.0 || >=3 || >=4 || >=5 || >=6"
176-
checksum: 10c0/f6c95f144958c678e8cbc691b205c937cbc456beab3da035ab3e00d55e91b8b39be6ff8529dbe3c72d0f95365988db09bc5862445f70c2438061dbe69bca34f5
176+
checksum: 10c0/0109a8800636c65b755a38987d22dcf350b316bf9cf5722eeb6ef76e21e6a2487d88edabd1a010f70e5bd1ef1b62463555d0d49fbb21e9a67e5de6c6d143f27c
177177
languageName: node
178178
linkType: hard
179179

@@ -1271,9 +1271,9 @@ __metadata:
12711271
languageName: node
12721272
linkType: hard
12731273

1274-
"@prisma/client@npm:6.16.2":
1275-
version: 6.16.2
1276-
resolution: "@prisma/client@npm:6.16.2"
1274+
"@prisma/client@npm:6.17.1":
1275+
version: 6.17.1
1276+
resolution: "@prisma/client@npm:6.17.1"
12771277
peerDependencies:
12781278
prisma: "*"
12791279
typescript: ">=5.1.0"
@@ -1282,7 +1282,7 @@ __metadata:
12821282
optional: true
12831283
typescript:
12841284
optional: true
1285-
checksum: 10c0/2d3356d18de6411dc61b701dfea2a4fc052913f7f7c6019d4cf477a2d391c7ca0adf1601f1d2b9030b5a1c2479b4d7d5b128e1b413218c1b12cd58f1091d2d1a
1285+
checksum: 10c0/dac39e6cca192720915e02c5d1c8b6e447dafb40522b7133a7bc0047462720de57e2a1370d76a69670f18d9699994b79d9afaba3407c1a97973b58ac066a9c90
12861286
languageName: node
12871287
linkType: hard
12881288

@@ -1784,12 +1784,12 @@ __metadata:
17841784
languageName: node
17851785
linkType: hard
17861786

1787-
"@types/node@npm:22.18.6":
1788-
version: 22.18.6
1789-
resolution: "@types/node@npm:22.18.6"
1787+
"@types/node@npm:22.18.11":
1788+
version: 22.18.11
1789+
resolution: "@types/node@npm:22.18.11"
17901790
dependencies:
17911791
undici-types: "npm:~6.21.0"
1792-
checksum: 10c0/7ba190da2e64e56c59270661af8cd682c830a1375b6f965ab153be90baabfdaa867aa1d63f87b42de80956996d46dfe1cf93ecefe982d9a16e485b6756949f9a
1792+
checksum: 10c0/3802f598608638e13ca350fbe2db0db5dde9a0b6704295fa1b6cec6defe24f9baf6a891eee6eaecd016bcd5ea18edecdaf71679d87079fe468913701adb61387
17931793
languageName: node
17941794
linkType: hard
17951795

@@ -2002,22 +2002,22 @@ __metadata:
20022002
"@ai-sdk/openai": "npm:1.3.24"
20032003
"@airbrake/browser": "npm:2.1.9"
20042004
"@airbrake/node": "npm:2.1.9"
2005-
"@auth/prisma-adapter": "npm:2.10.0"
2005+
"@auth/prisma-adapter": "npm:2.11.0"
20062006
"@biomejs/biome": "npm:2.2.5"
20072007
"@faker-js/faker": "npm:9.9.0"
20082008
"@headlessui/react": "npm:2.2.9"
20092009
"@microlink/react-json-view": "npm:1.27.0"
2010-
"@prisma/client": "npm:6.16.2"
2010+
"@prisma/client": "npm:6.17.1"
20112011
"@testing-library/dom": "npm:^10.4.0"
20122012
"@testing-library/react": "npm:^16.3.0"
2013-
"@types/node": "npm:22.18.6"
2013+
"@types/node": "npm:22.18.11"
20142014
"@types/react": "npm:19.1.15"
20152015
"@types/react-dom": "npm:19.1.9"
20162016
"@types/react-syntax-highlighter": "npm:^15.5.13"
20172017
"@vitejs/plugin-react": "npm:4.7.0"
20182018
ai: "npm:4.3.19"
20192019
babel-plugin-react-compiler: "npm:19.1.0-rc.3"
2020-
chart.js: "npm:4.5.0"
2020+
chart.js: "npm:4.5.1"
20212021
clsx: "npm:2.1.1"
20222022
date-fns: "npm:4.1.0"
20232023
jsdom: "npm:26.1.0"
@@ -2318,12 +2318,12 @@ __metadata:
23182318
languageName: node
23192319
linkType: hard
23202320

2321-
"chart.js@npm:4.5.0":
2322-
version: 4.5.0
2323-
resolution: "chart.js@npm:4.5.0"
2321+
"chart.js@npm:4.5.1":
2322+
version: 4.5.1
2323+
resolution: "chart.js@npm:4.5.1"
23242324
dependencies:
23252325
"@kurkle/color": "npm:^0.3.0"
2326-
checksum: 10c0/f12c7f9a238ee7ce6d3f7111628e9daba86bb8ff8e54cfe63525fde6ded9003c72c4c8d2c7d5702539dc0aff7e682dfec058660ade8d03a970da002656d4ac91
2326+
checksum: 10c0/3f2a11dcaae9079e8e6b8ad077e2ae311f04996f9da14815730891e66215ee8b5f2c0eb70b5a156e5bde0f89a41bae13506dc6153e50fd22dcb282b21eec706f
23272327
languageName: node
23282328
linkType: hard
23292329

0 commit comments

Comments
 (0)