Skip to content

Commit b0673ff

Browse files
authored
Merge pull request #499 from damongolding/chore/add-air
add AIR support
2 parents 47ef91e + d4f9fa2 commit b0673ff

File tree

10 files changed

+232
-29
lines changed

10 files changed

+232
-29
lines changed

.air.toml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
root = "."
2+
testdata_dir = "testdata"
3+
tmp_dir = "tmp"
4+
5+
[build]
6+
args_bin = []
7+
bin = "./dist/kiosk"
8+
full_bin = "KIOSK_DEBUG=true ./dist/kiosk"
9+
cmd = "task build"
10+
delay = 1000
11+
exclude_dir = [
12+
"assets",
13+
"tmp",
14+
"vendor",
15+
"testdata",
16+
"offline-assets",
17+
"node_modules",
18+
]
19+
exclude_file = []
20+
exclude_regex = ["_test.go", "internal/templates/.*\\.go$"]
21+
exclude_unchanged = false
22+
follow_symlink = false
23+
include_dir = []
24+
include_ext = ["go", "tpl", "tmpl", "templ", "html"]
25+
include_file = []
26+
kill_delay = "0s"
27+
log = "build-errors.log"
28+
poll = false
29+
poll_interval = 0
30+
post_cmd = []
31+
pre_cmd = []
32+
rerun = false
33+
rerun_delay = 500
34+
send_interrupt = false
35+
stop_on_error = false
36+
37+
[color]
38+
app = ""
39+
build = "yellow"
40+
main = "magenta"
41+
runner = "green"
42+
watcher = "cyan"
43+
44+
[log]
45+
main_only = false
46+
time = false
47+
48+
[misc]
49+
clean_on_exit = false
50+
51+
[proxy]
52+
app_port = 0
53+
enabled = false
54+
proxy_port = 0
55+
56+
[screen]
57+
clear_on_rebuild = false
58+
keep_scroll = true

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ offline-assets/
4747

4848
frontend/public/assets/css
4949
frontend/public/assets/js/kiosk.js
50+
51+
/tmp/

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
1717
RUN pnpm css && pnpm js
1818

1919
# Go Builder
20-
FROM --platform=$BUILDPLATFORM golang:1.24.4-alpine AS build
20+
FROM --platform=$BUILDPLATFORM golang:1.24.6-alpine AS build
2121

2222
ARG VERSION=demo
2323
ARG TARGETOS

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"postcss": "^8.5.6",
2828
"postcss-cli": "^11.0.1",
2929
"postcss-nested": "^7.0.2",
30-
"typescript": "^5.8.3"
30+
"typescript": "^5.9.2"
3131
},
3232
"browserslist": [
3333
"> 0.2%",

frontend/pnpm-lock.yaml

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/damongolding/immich-kiosk
22

3-
go 1.24.4
3+
go 1.24.6
44

55
require (
66
github.com/EdlinOrg/prominentcolor v1.0.0
@@ -31,16 +31,21 @@ require (
3131
)
3232

3333
require (
34+
dario.cat/mergo v1.0.2 // indirect
3435
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect
36+
github.com/air-verse/air v1.62.0 // indirect
3537
github.com/andybalholm/brotli v1.1.1 // indirect
3638
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3739
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
40+
github.com/bep/godartsass/v2 v2.5.0 // indirect
41+
github.com/bep/golibsass v1.2.0 // indirect
3842
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3943
github.com/charmbracelet/colorprofile v0.3.1 // indirect
4044
github.com/charmbracelet/x/ansi v0.9.3 // indirect
4145
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
4246
github.com/charmbracelet/x/term v0.2.1 // indirect
4347
github.com/cli/browser v1.3.0 // indirect
48+
github.com/creack/pty v1.1.24 // indirect
4449
github.com/davecgh/go-spew v1.1.1 // indirect
4550
github.com/dprotaso/go-yit v0.0.0-20250513224043-18a80f8f6df4 // indirect
4651
github.com/fatih/color v1.18.0 // indirect
@@ -50,6 +55,8 @@ require (
5055
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5156
github.com/go-openapi/swag v0.23.1 // indirect
5257
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
58+
github.com/gobwas/glob v0.2.3 // indirect
59+
github.com/gohugoio/hugo v0.147.6 // indirect
5360
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
5461
github.com/josharian/intern v1.0.0 // indirect
5562
github.com/labstack/gommon v0.4.2 // indirect
@@ -66,6 +73,7 @@ require (
6673
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
6774
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
6875
github.com/oliamb/cutter v0.2.2 // indirect
76+
github.com/pelletier/go-toml v1.9.5 // indirect
6977
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
7078
github.com/perimeterx/marshmallow v1.1.5 // indirect
7179
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -78,6 +86,7 @@ require (
7886
github.com/spf13/cast v1.9.2 // indirect
7987
github.com/spf13/pflag v1.0.7 // indirect
8088
github.com/subosito/gotenv v1.6.0 // indirect
89+
github.com/tdewolff/parse/v2 v2.8.1 // indirect
8190
github.com/valyala/bytebufferpool v1.0.0 // indirect
8291
github.com/valyala/fasttemplate v1.2.2 // indirect
8392
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
@@ -92,11 +101,12 @@ require (
92101
golang.org/x/net v0.42.0 // indirect
93102
golang.org/x/sys v0.34.0 // indirect
94103
golang.org/x/tools v0.35.0 // indirect
104+
google.golang.org/protobuf v1.36.6 // indirect
95105
gopkg.in/yaml.v2 v2.4.0 // indirect
96106
)
97107

98108
tool (
99109
github.com/a-h/templ/cmd/templ
100-
github.com/damongolding/immich-kiosk
110+
github.com/air-verse/air
101111
github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen
102112
)

0 commit comments

Comments
 (0)