fmt & deploy

.github/workflows/deploy_pages.yaml

@@ -2,34 +2,27 @@ name: Deploy to GitHub Pages
 
 on:
   push:
-    branches: [master]  # Set this to your default branch
+    branches: [master]
   pull_request:
     branches: [master]
+  workflow_dispatch:
+
+env:
+  NODE_VERSION: '18'
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: '18'  # Adjust this to match your project's Node.js version
-
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: actions/setup-node@v4
       with:
-        toolchain: stable
-        target: wasm32-unknown-unknown
-
-    - name: Install wasm-pack
-      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
-    - name: Build Rust WASM
-      run: wasm-pack build --target web
+        node-version: ${{ env.NODE_VERSION }}
+        cache: 'npm'
 
     - name: Install dependencies
       run: npm ci
@@ -41,19 +34,18 @@ jobs:
 
     - name: Deploy to GitHub Pages
       uses: peaceiris/actions-gh-pages@v3
-      if: github.ref == 'refs/heads/master'
+      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
       with:
+          #github_token: ${{ secrets.GH_PAT }}
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./dist  # Adjust this to match your build output directory
-
-    - name: Upload artifact
-      uses: actions/upload-pages-artifact@v1
-      with:
-        path: ./dist  # Adjust this to match your build output directory
+        publish_dir: ./dist
+        commit_message: ${{ github.event.head_commit.message }}
+        force_orphan: true
 
   deploy:
     needs: build-and-deploy
     runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
     permissions:
       pages: write
       id-token: write
@@ -63,4 +55,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

www/app.config.js

@@ -1,7 +1,7 @@
 import { defineConfig } from "@solidjs/start/config";
 import UnoCSS from "unocss/vite";
-import { fileURLToPath } from 'url';
-import { dirname, resolve } from 'path';
+import { fileURLToPath } from "url";
+import { dirname, resolve } from "path";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -13,21 +13,21 @@ export default defineConfig({
       fs: {
         allow: [
           // Add the directory containing your WASM file
-          resolve(__dirname, '../pkg'),
+          resolve(__dirname, "../pkg"),
           // Include the project root and node_modules
           __dirname,
-          resolve(__dirname, 'node_modules')
+          resolve(__dirname, "node_modules"),
         ],
       },
       prerender: {
-        crawllinks: true
-      }
+        crawllinks: true,
+      },
     },
     build: {
-      target: 'esnext',
+      target: "esnext",
     },
     optimizeDeps: {
-      exclude: ['@mapbox/tiny-sdf']
+      exclude: ["@mapbox/tiny-sdf"],
     },
     // Add WASM support
     worker: {
@@ -45,5 +45,5 @@ export default defineConfig({
         },
       ],
     },
-  }
+  },
 });

www/jsconfig.json

@@ -3,9 +3,7 @@
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
     "paths": {
-      "~/*": [
-        "./src/*"
-      ]
+      "~/*": ["./src/*"]
     }
   }
-}
+}