From fb882b9ce505340b58a9144b143213dfeb033a5b Mon Sep 17 00:00:00 2001 From: LukeGus Date: Wed, 20 May 2026 15:17:02 -0500 Subject: [PATCH] fix: build failure --- .github/workflows/openapi.yml | 5 +---- .github/workflows/pr-check.yml | 6 +----- docker/Dockerfile | 7 ++----- package.json | 8 ++++---- 4 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index 13628545..04383210 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -22,10 +22,7 @@ jobs: run: npm ci - name: Generate OpenAPI specification - run: | - npx tsc -p tsconfig.node.json - cp src/backend/package.json dist/backend/package.json - node ./dist/backend/backend/swagger.js + run: npm run generate:openapi - name: Upload OpenAPI artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 336a2568..b65c35ba 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -33,8 +33,4 @@ jobs: run: npx tsc --noEmit - name: Build - run: | - npm run prebuild - npx vite build - npx tsc -p tsconfig.node.json - cp src/backend/package.json dist/backend/package.json + run: npm run build diff --git a/docker/Dockerfile b/docker/Dockerfile index bd22ac58..bb6236e0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -20,10 +20,7 @@ COPY . . RUN find public/fonts -name "*.ttf" ! -name "*Regular.ttf" ! -name "*Bold.ttf" ! -name "*Italic.ttf" -delete RUN npm cache clean --force && \ - NODE_OPTIONS="--max-old-space-size=3072" npm run prebuild && \ - npx vite build && \ - npx tsc -p tsconfig.node.json && \ - cp src/backend/package.json dist/backend/package.json + NODE_OPTIONS="--max-old-space-size=3072" npm run build # Stage 3: Build backend FROM deps AS backend-builder @@ -33,7 +30,7 @@ COPY . . RUN npm rebuild better-sqlite3 -RUN npx tsc -p tsconfig.node.json && cp src/backend/package.json dist/backend/package.json +RUN npm run build:backend # Stage 4: Production dependencies only FROM node:24-slim AS production-deps diff --git a/package.json b/package.json index 814043e3..06033a07 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,12 @@ "lint:fix": "eslint --fix .", "type-check": "tsc --noEmit", "dev": "vite", - "build": "vite build && tsc -p tsconfig.node.json && powershell -c \"Copy-Item src/backend/package.json dist/backend/package.json\"", - "build:backend": "tsc -p tsconfig.node.json && powershell -c \"Copy-Item src/backend/package.json dist/backend/package.json\"", - "dev:backend": "tsc -p tsconfig.node.json && powershell -c \"Copy-Item src/backend/package.json dist/backend/package.json\" && node ./dist/backend/backend/starter.js", + "build": "vite build && tsc -p tsconfig.node.json && node -e \"require('fs').copyFileSync('src/backend/package.json','dist/backend/package.json')\"", + "build:backend": "tsc -p tsconfig.node.json && node -e \"require('fs').copyFileSync('src/backend/package.json','dist/backend/package.json')\"", + "dev:backend": "tsc -p tsconfig.node.json && node -e \"require('fs').copyFileSync('src/backend/package.json','dist/backend/package.json')\" && node ./dist/backend/backend/starter.js", "dev:docker": "docker stop termix-dev 2>nul & docker rm termix-dev 2>nul & docker build -f docker/Dockerfile -t termix:dev --no-cache . && docker run -d --name termix-dev -p 3000:3000 -p 8080:8080 -p 30001-30006:30001-30006 -v \"%cd%\\db\\data:/app/data\" termix:dev", "dev:docker:restart": "docker stop termix-dev 2>nul & docker rm termix-dev 2>nul & docker run -d --name termix-dev -p 8080:8080 -p 30001-30006:30001-30006 -v \"%cd%\\db\\data:/app/data\" termix:dev", - "generate:openapi": "tsc -p tsconfig.node.json && powershell -c \"Copy-Item src/backend/package.json dist/backend/package.json\" && node ./dist/backend/backend/swagger.js", + "generate:openapi": "tsc -p tsconfig.node.json && node -e \"require('fs').copyFileSync('src/backend/package.json','dist/backend/package.json')\" && node ./dist/backend/backend/swagger.js", "preview": "vite preview", "electron:dev": "concurrently \"npm run dev\" \"powershell -c \\\"Start-Sleep -Seconds 5\\\" && electron .\"", "electron:patch-builder": "node scripts/patch-app-builder-lib.cjs",