chore(backend,frontend,infra): resolve template update conflicts, mcp and impeccable files stay

This commit was merged in pull request #6.
This commit is contained in:
hh committed 2026-10-10 03:08:21 +00:00
1 parent 417640e75d
commit c7e6e3c2d3
6 files changed
+16 -38

No files matched your search

+5
View File
@@ -16,3 +16,8 @@ node_modules
# Vite
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
# Impeccable
**/.impeccable/config.local.json
**/.impeccable/hook.cache.json
**/.impeccable/hook.pending.json
+7 -1
View File
@@ -2,7 +2,13 @@
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"extends": ["ultracite/biome/core", "ultracite/biome/svelte"],
"files": {
"includes": ["!.claude", "!.svelte-kit", "!build", "!.mcp.json"]
"includes": [
"!.claude",
"!.svelte-kit",
"!build",
"!.mcp.json",
"!.impeccable"
]
},
"javascript": { "globals": ["Bun"] },
"overrides": [
-7
View File
@@ -15,11 +15,8 @@
},
"devDependencies": {
"@biomejs/biome": "2.5.13",
<<<<<<< before updating
"@fontsource-variable/archivo": "^5.3.0",
"@fontsource-variable/jetbrains-mono": "^5.3.0",
=======
>>>>>>> after updating
"@internationalized/date": "^3.12.0",
"@lucide/svelte": "^1.23.0",
"@sveltejs/adapter-static": "^3.0.10",
@@ -42,11 +39,7 @@
"tailwindcss": "^4.3.0",
"tw-animate-css": "^1.4.0",
"typescript": "^6.0.3",
<<<<<<< before updating
"ultracite": "7.12.4",
=======
"ultracite": "7.12.0",
>>>>>>> after updating
"vite": "^8.0.16"
}
}