From 9d96502eb5463c222006301d4dd5609d953e8c35 Mon Sep 17 00:00:00 2001 From: renovate Date: Sat, 10 Oct 2026 00:30:48 +0000 Subject: [PATCH] chore(frontend): update template to v0.6.0, conflicts left --- .copier/frontend.yml | 4 ++-- .impeccable/.gitignore | 5 ----- .mcp.json | 8 -------- frontend/.dockerignore | 4 +++- frontend/.gitignore | 5 ----- frontend/Makefile | 12 +----------- frontend/biome.jsonc | 8 +------- frontend/docker-compose.override.yml.example | 2 ++ frontend/package.json | 19 +++++++++++++------ 9 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 .impeccable/.gitignore delete mode 100644 .mcp.json diff --git a/.copier/frontend.yml b/.copier/frontend.yml index 0504345..91a189b 100644 --- a/.copier/frontend.yml +++ b/.copier/frontend.yml @@ -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 diff --git a/.impeccable/.gitignore b/.impeccable/.gitignore deleted file mode 100644 index 440338a..0000000 --- a/.impeccable/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -config.local.json -hook.cache.json -hook.pending.json -review/ -decision/ diff --git a/.mcp.json b/.mcp.json deleted file mode 100644 index 04506c8..0000000 --- a/.mcp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "mcpServers": { - "svelte": { - "type": "http", - "url": "https://mcp.svelte.dev/mcp" - } - } -} diff --git a/frontend/.dockerignore b/frontend/.dockerignore index 1048241..ed46f37 100644 --- a/frontend/.dockerignore +++ b/frontend/.dockerignore @@ -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.* diff --git a/frontend/.gitignore b/frontend/.gitignore index 46a573e..7dcbc6e 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -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 diff --git a/frontend/Makefile b/frontend/Makefile index 0cef562..484b133 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -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 diff --git a/frontend/biome.jsonc b/frontend/biome.jsonc index c7835bb..f278fd5 100644 --- a/frontend/biome.jsonc +++ b/frontend/biome.jsonc @@ -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": [ diff --git a/frontend/docker-compose.override.yml.example b/frontend/docker-compose.override.yml.example index 8909d52..b2a1248 100644 --- a/frontend/docker-compose.override.yml.example +++ b/frontend/docker-compose.override.yml.example @@ -5,6 +5,8 @@ services: caddy: aliases: - lodge-frontend +# ports: +# - "127.0.0.1:3000:3000" networks: caddy: diff --git a/frontend/package.json b/frontend/package.json index 1ad7820..d155ac3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -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" } }