chore: fix github pages

Author: heiso

.github/workflows/deploy.yml

@@ -3,44 +3,56 @@ name: Deploy
 on:
   push:
     branches: [main]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Allow one concurrent deployment
+concurrency:
+  group: 'pages'
+  cancel-in-progress: true
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
 
 jobs:
-  # Build job
-  build:
+  deploy:
+    defaults:
+      run:
+        working-directory: web-app
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v3
-      - uses: actions/setup-node@v4
+      - name: Get Node version
+        run: echo "NODE_VERSION=$(cat .nvmrc)" >> $GITHUB_OUTPUT
+        id: node-version
+      - name: Set up Node
+        uses: actions/setup-node@v4
         with:
-          node-version: 20.x
-      - run: npm ci
-        working-directory: web-app
-      - run: npx tsx generate-svg-icons-sprite.ts
-        working-directory: web-app
-      - run: npm run build
-        working-directory: web-app
+          cache-dependency-path: web-app/package-lock.json
+          node-version: ${{ steps.node-version.outputs.NODE_VERSION }}
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci
+      - name: Generate SVG icons sprite
+        run: npx tsx generate-svg-icons-sprite.ts
+      - name: Build
+        run: npm run build
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: 'web-app/build/client'
-
-  # Deployment job
-  deploy:
-    # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-    permissions:
-      contents: read
-      pages: write
-      id-token: write
-    environment:
-      name: github-pages
-      url: https://heiso.github.io/macrolev
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
+          path: 'build/client'
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@v4

web-app/package.json

@@ -5,10 +5,10 @@
   "version": "0.0.0",
   "scripts": {
     "build": "cross-env NODE_ENV=production react-router build",
-    "preview": "react-router preview",
+    "preview": "vite preview",
     "dev": "react-router dev",
     "start": "cross-env NODE_ENV=production react-router-serve ./build/server/index.js",
-    "typecheck": "react-router typegen && tsc && && eslint . && prettier --check .",
+    "typecheck": "react-router typegen && tsc && eslint . && prettier --check .",
     "check-dependencies": "npx npm-check-updates --peer --format group -i",
     "down": "pm2 delete ecosystem.config.cjs",
     "log": "pm2 log",

web-app/vite.config.ts

@@ -14,5 +14,5 @@ export default defineConfig({
       plugins: [autoprefixer],
     },
   },
-  plugins: [reactRouter(), tsconfigPaths(), tailwindcss()],
+  plugins: [tailwindcss(), reactRouter(), tsconfigPaths()],
 })