diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 8df8910..d0a6c56 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -22,14 +22,13 @@ jobs: - name: Build client (Vite.js) run: | + bun i cd client - npm ci - npm run build + bunx --bun vite build client --emptyOutDir --outDir '../server/public' + docker build -t ${{ github.repository }} . - - name: Build server (Bun) - run: | - cd server - bun install + + cd .. docker build -t ${{ github.repository }} . - name: Get Tag diff --git a/.gitignore b/.gitignore index 438657a..1197060 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ dist dist-ssr *.local .env +server/public # Editor directories and files .vscode/* diff --git a/bun.lockb b/bun.lockb new file mode 100755 index 0000000..944507d Binary files /dev/null and b/bun.lockb differ diff --git a/client/package.json b/client/package.json index 8ab9e2a..e98bc9a 100644 --- a/client/package.json +++ b/client/package.json @@ -4,12 +4,9 @@ "version": "0.0.0", "type": "module", "scripts": { - "build": "vite build --emptyOutDir", - "dev": "vite", - "lint": "eslint src --ext js,jsx --report-unused-disable-directives --max-warnings 0", - "preview": "vite preview", - "start": "npm run dev", - "deploy": "git switch main && git pull origin main --rebase --tags && git merge staging && npm version $npm_config_level && git push origin main --tags && git switch staging" + "dev": "bunx --bun vite", + "build": "bunx --bun vite build --emptyOutDir --outDir '../server/public'", + "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0" }, "dependencies": { "@dataesr/dsfr-plus": "^0.4.1", diff --git a/client/stats.html b/client/stats.html index c3f6ad7..9adac7c 100644 --- a/client/stats.html +++ b/client/stats.html @@ -4822,7 +4822,7 @@