chore(frontend): update template to v0.6.0, conflicts left
This commit is contained in:
1 parent
56544bd025
commit
9d96502eb5
9 files changed
+22
-45
No files matched your search
@@ -1,8 +1,8 @@
|
||||
_commit: v0.3.1
|
||||
_commit: v0.6.0
|
||||
_src_path: https://git.kotikot.com/templates/frontend-svelte.git
|
||||
include_impeccable: true
|
||||
install_deps: true
|
||||
layout: part
|
||||
linter: biome
|
||||
project_name: lodge
|
||||
project_slug: lodge
|
||||
serve: api
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
config.local.json
|
||||
hook.cache.json
|
||||
hook.pending.json
|
||||
review/
|
||||
decision/
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"mcpServers": {
|
||||
"svelte": {
|
||||
"type": "http",
|
||||
"url": "https://mcp.svelte.dev/mcp"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
node_modules
|
||||
.svelte-kit
|
||||
build
|
||||
.env
|
||||
# .env goes into the build: $env/static/public (and static/private) are
|
||||
# inlined at build time from it. It stays in the builder stage, the runtime
|
||||
# image gets build/ only. Local overrides (.env.local and the like) stay out.
|
||||
.env.*
|
||||
@@ -16,8 +16,3 @@ node_modules
|
||||
# Vite
|
||||
vite.config.js.timestamp-*
|
||||
vite.config.ts.timestamp-*
|
||||
|
||||
# Impeccable
|
||||
**/.impeccable/config.local.json
|
||||
**/.impeccable/hook.cache.json
|
||||
**/.impeccable/hook.pending.json
|
||||
+1
-11
@@ -1,8 +1,6 @@
|
||||
COMPOSE := cd .. && docker compose
|
||||
changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
|
||||
stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
|
||||
|
||||
.PHONY: fmt check build pre-deploy post-deploy dev
|
||||
.PHONY: fmt check build dev
|
||||
|
||||
fmt:
|
||||
bun run fix
|
||||
@@ -14,13 +12,5 @@ check:
|
||||
build:
|
||||
$(COMPOSE) run --rm frontend-dev sh -c "bun install && bun run build"
|
||||
|
||||
pre-deploy:
|
||||
@if $(call changed,refs/deploy/frontend,.) || ! test -d build; then \
|
||||
$(MAKE) build && $(call stamp,refs/deploy/frontend); \
|
||||
fi
|
||||
|
||||
post-deploy:
|
||||
@:
|
||||
|
||||
dev:
|
||||
bun run dev
|
||||
@@ -2,13 +2,7 @@
|
||||
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
|
||||
"extends": ["ultracite/biome/core", "ultracite/biome/svelte"],
|
||||
"files": {
|
||||
"includes": [
|
||||
"!.claude",
|
||||
"!.svelte-kit",
|
||||
"!build",
|
||||
"!.mcp.json",
|
||||
"!.impeccable"
|
||||
]
|
||||
"includes": ["!.claude", "!.svelte-kit", "!build", "!.mcp.json"]
|
||||
},
|
||||
"javascript": { "globals": ["Bun"] },
|
||||
"overrides": [
|
||||
|
||||
@@ -5,6 +5,8 @@ services:
|
||||
caddy:
|
||||
aliases:
|
||||
- lodge-frontend
|
||||
# ports:
|
||||
# - "127.0.0.1:3000:3000"
|
||||
|
||||
networks:
|
||||
caddy:
|
||||
|
||||
+13
-6
@@ -1,22 +1,25 @@
|
||||
{
|
||||
"name": "lodge",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"version": "0.0.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite dev",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview",
|
||||
"prepare": "svelte-kit sync || echo ''",
|
||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||
"dev": "vite dev",
|
||||
"fix": "ultracite fix",
|
||||
"lint": "ultracite check",
|
||||
"fix": "ultracite fix"
|
||||
"prepare": "svelte-kit sync || echo ''",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"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",
|
||||
@@ -39,7 +42,11 @@
|
||||
"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"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user