Skip to content

Commit 222f446

Browse files
authored
Merge pull request #32 from asepindrak/dev
Dev
2 parents 411582a + 8c714c8 commit 222f446

10 files changed

Lines changed: 945 additions & 872 deletions

File tree

.changeset/common-moose-change.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"commitflow": patch
3+
---
4+
5+
fix: error VitePWA

.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules
2+
dist
3+
.git
4+
.gitignore
5+
Dockerfile
6+
docker-compose.yml

backend/.dockerignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
logs
2+
node_modules
3+
dist
4+
.git
5+
.gitignore
6+
Dockerfile
7+
docker-compose.yml

docker-compose.dev.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,22 @@ services:
4747
dockerfile: Dockerfile
4848
target: development
4949
container_name: commitflow-ui
50-
restart: unless-stopped
51-
env_file:
52-
- .env
5350
ports:
5451
- "${FE_PORT:-3000}:5173"
52+
env_file:
53+
- .env
5554
environment:
5655
- NODE_ENV=development
5756
volumes:
58-
- ./frontend:/app
59-
- commitflow_ui_modules:/app/node_modules
57+
- ./frontend/src:/app/src
58+
- ./frontend/public:/app/public
59+
- ./frontend/index.html:/app/index.html
60+
- ./frontend/vite.config.ts:/app/vite.config.ts
61+
- ./frontend/package.json:/app/package.json
62+
- ./frontend/package-lock.json:/app/package-lock.json
6063
depends_on:
6164
- backend
65+
6266
volumes:
6367
pgdata:
6468
commitflow_api_modules:

frontend/.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules
2+
dist
3+
.git
4+
.gitignore
5+
Dockerfile
6+
docker-compose.yml

frontend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# =========================
22
# STAGE 1: BASE
33
# =========================
4-
FROM node:22-alpine AS base
4+
FROM node:20-alpine AS base
55
WORKDIR /app
66

77
COPY package*.json ./
88
RUN npm install -g npm@11
9-
109
# =========================
1110
# STAGE 2: DEPENDENCIES
1211
# =========================
1312
FROM base AS deps
1413
RUN npm install
1514

15+
1616
# =========================
1717
# STAGE 3: BUILD (Production)
1818
# =========================

frontend/package-lock.json

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

frontend/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"author": "asepindrak",
55
"private": false,
66
"license": "MIT",
7-
"version": "1.4.2",
7+
"version": "1.4.3",
88
"type": "module",
99
"scripts": {
1010
"dev": "vite --host 0.0.0.0",
@@ -43,7 +43,6 @@
4343
"tailwindcss": "^4.1.15",
4444
"uuid": "^13.0.0",
4545
"vico-logger": "^1.1.23",
46-
"vite-plugin-pwa": "^1.2.0",
4746
"xlsx": "^0.18.5",
4847
"zustand": "^5.0.8"
4948
},
@@ -60,6 +59,7 @@
6059
"tw-animate-css": "^1.4.0",
6160
"typescript": "~5.9.3",
6261
"typescript-eslint": "^8.45.0",
63-
"vite": "^7.1.7"
62+
"vite": "^7.1.7",
63+
"vite-plugin-pwa": "^1.2.0"
6464
}
6565
}

frontend/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from "path"
22
import tailwindcss from "@tailwindcss/vite"
33
import { defineConfig } from 'vite'
44
import react from '@vitejs/plugin-react'
5-
import { VitePWA } from 'vite-plugin-pwa' // ⬅️ TAMBAH
5+
import { VitePWA } from 'vite-plugin-pwa'
66

77
export default defineConfig({
88
plugins: [

package-lock.json

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

0 commit comments

Comments
 (0)