From 77c52f061c50f49abcf7ce0a91a642e4380a505c Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Mon, 2 Jun 2025 15:33:22 -0700
Subject: [PATCH] Fix merge conflict

---
 package.json | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 64d2243..e2df75d 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,15 @@
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --check . && eslint .",
-		"format": "prettier --write ."
+		"format": "prettier --write .",
+		"db:migrate": "prisma migrate dev",
+		"db:seed": "prisma db seed",
+		"db:studio": "prisma studio",
+		"db:init": "tsx scripts/init-db.ts",
+		"db:deploy": "prisma migrate deploy",
+		"setup:local": "./scripts/setup-local.sh",
+		"storybook": "storybook dev -p 6006",
+		"build-storybook": "storybook build"
 	},
 	"devDependencies": {
 		"@musicorum/lastfm": "github:jedmund/lastfm",
@@ -50,6 +58,23 @@
 		"psn-api": "github:jedmund/psn-api",
 		"redis": "^4.7.0",
 		"steamapi": "^3.0.11",
-		"tinyduration": "^3.3.1"
+		"svelte-tiptap": "^2.1.0",
+		"svgo": "^3.3.2",
+		"tinyduration": "^3.3.1",
+		"tippy.js": "^6.3.7",
+		"tiptap-extension-auto-joiner": "^0.1.3",
+		"tiptap-extension-global-drag-handle": "^0.1.18",
+		"tiptap-markdown": "^0.8.10",
+		"zod": "^3.25.30"
+	},
+	"prisma": {
+		"seed": "tsx prisma/seed.ts"
+	},
+	"engines": {
+		"node": ">=20.0.0",
+		"npm": ">=10.0.0"
+	},
+	"overrides": {
+		"@sveltejs/vite-plugin-svelte": "^4.0.0-next.6"
 	}
 }