Fix merge conflict
This commit is contained in:
parent
1f1d7551fb
commit
77c52f061c
1 changed files with 27 additions and 2 deletions
29
package.json
29
package.json
|
|
@ -10,7 +10,15 @@
|
||||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
"lint": "prettier --check . && eslint .",
|
"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": {
|
"devDependencies": {
|
||||||
"@musicorum/lastfm": "github:jedmund/lastfm",
|
"@musicorum/lastfm": "github:jedmund/lastfm",
|
||||||
|
|
@ -50,6 +58,23 @@
|
||||||
"psn-api": "github:jedmund/psn-api",
|
"psn-api": "github:jedmund/psn-api",
|
||||||
"redis": "^4.7.0",
|
"redis": "^4.7.0",
|
||||||
"steamapi": "^3.0.11",
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue