Skip to content

Commit

Permalink
upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
martinjirku committed Nov 5, 2024
1 parent c3381f5 commit d601951
Show file tree
Hide file tree
Showing 5 changed files with 664 additions and 406 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM golang:1.22.0 as watch-base
FROM golang:1.23.0 as watch-base
# Install Node.js
RUN apt-get update && apt-get install -y curl
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
RUN apt-get install -y nodejs
ENV PNPM_HOME="/pnpm"
ENV PATH="$PNPM_HOME:$PATH"
RUN corepack enable && corepack use [email protected]
RUN go install github.com/cosmtrek/air@latest
RUN go install github.com/air-verse/air@latest
RUN go install github.com/go-task/task/v3/cmd/task@latest

FROM watch-base as watch
Expand All @@ -25,7 +25,7 @@ FROM node:20-slim AS node-base
RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
RUN pnpm build

FROM golang:1.22.0 as be-builder
FROM golang:1.23.0 as be-builder
COPY . /app
COPY --from=node-base /app/dist /app/dist
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tasks:
deps: [bin:base]
silent: true
cmds:
- export GOBIN={{.GOBIN}} && go install github.com/cosmtrek/air@latest
- export GOBIN={{.GOBIN}} && go install github.com/air-verse/air@latest
generates:
- .task/bin/air
test:
Expand Down
7 changes: 4 additions & 3 deletions compose.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
version: "3.8"

services:
app:
build:
target: watch
ports:
- 8080:8080
- "8080:8080"
environment:
GOOGLE_API_KEY: ${GOOGLE_API_KEY}
GOOGLE_CALENDAR_ID: ${GOOGLE_CALENDAR_ID}
Expand All @@ -26,10 +24,13 @@ services:
action: rebuild
- path: handlers/
action: sync
target: watch
- path: templates/
action: sync
target: watch
- path: pkg/
action: sync
target: watch
command: task

volumes:
Expand Down
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@
"build:vite": "vite build"
},
"devDependencies": {
"@types/node": "^20.10.4",
"autoprefixer": "^10.4.19",
"@types/node": "^20.17.6",
"autoprefixer": "^10.4.20",
"fast-glob": "^3.3.2",
"postcss": "^8.4.38",
"tailwindcss": "^3.3.6",
"typescript": "^5.3.3",
"vite": "^5.0.7",
"vite-plugin-static-copy": "^1.0.0"
"postcss": "^8.4.47",
"tailwindcss": "^3.4.14",
"typescript": "^5.6.3",
"vite": "^5.4.10",
"vite-plugin-static-copy": "^1.0.6"
},
"dependencies": {
"@floating-ui/core": "^1.5.2",
"@floating-ui/dom": "^1.5.3",
"@floating-ui/core": "^1.6.8",
"@floating-ui/dom": "^1.6.12",
"htmx": "^0.0.2"
}
},
"packageManager": "[email protected]+sha512.cce0f9de9c5a7c95bef944169cc5dfe8741abfb145078c0d508b868056848a87c81e626246cb60967cbd7fd29a6c062ef73ff840d96b3c86c40ac92cf4a813ee"
}
Loading

0 comments on commit d601951

Please sign in to comment.