chore: update version to 1.0.4 [skip ci]

Reviewed-on: #22
Co-authored-by: Juan Sebastian Montoya <juansmm@outlook.com>
Co-committed-by: Juan Sebastian Montoya <juansmm@outlook.com>

.forgejo/workflows/publish-and-deploy.yaml

@@ -105,6 +105,60 @@ jobs:
           echo "New version: $NEW_VERSION"
           echo "Current VERSION file: $(cat VERSION 2>/dev/null || echo 'not found')"
 
+      - name: Update Version Files
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          TAG="${{ steps.version.outputs.tag }}"
+          
+          echo "📝 Updating version files to: $VERSION"
+          
+          # Configure git
+          git config user.name "forgebot"
+          git config user.email "forgebot@forgejo.io"
+          
+          # Fetch latest changes to avoid conflicts
+          git fetch origin main || echo "Fetch completed or already up to date"
+          git checkout main || echo "Already on main"
+          
+          # Update VERSION file
+          echo "$VERSION" > VERSION
+          
+          # Update portainer.yml with new version
+          sed -i "s|\(image: git.jusemon.com/jusemon/threejs-test:\)[0-9.]*|\1$VERSION|" portainer.yml
+          
+          # Verify the updates
+          if grep -q "^$VERSION$" VERSION && grep -q "image: git.jusemon.com/jusemon/threejs-test:$VERSION" portainer.yml; then
+            echo "✅ Successfully updated VERSION and portainer.yml to $VERSION"
+          else
+            echo "❌ Failed to update version files"
+            exit 1
+          fi
+          
+          # Check if there are changes to commit
+          if git diff --quiet VERSION portainer.yml; then
+            echo "⚠️ No changes to commit (files already up to date)"
+            echo "VERSION_COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          else
+            # Stage and commit with [skip ci] to prevent infinite loop
+            # Note: Forgejo Actions should respect [skip ci] in commit messages
+            git add VERSION portainer.yml
+            git commit -m "chore: update version to $VERSION [skip ci]" || {
+              echo "⚠️ Commit failed (may already be committed)"
+              exit 0
+            }
+            
+            # Push to main branch (remote should already be configured with token)
+            git push origin main || {
+              echo "⚠️ Push failed (check token permissions)"
+              exit 0
+            }
+            
+            # Get the commit hash of the version update commit
+            VERSION_COMMIT_HASH=$(git rev-parse HEAD)
+            echo "VERSION_COMMIT_HASH=$VERSION_COMMIT_HASH" >> $GITHUB_ENV
+            echo "✅ Successfully committed and pushed version update to $VERSION (commit: $VERSION_COMMIT_HASH)"
+          fi
+
       - name: Build Docker Image
         run: |
           VERSION="${{ steps.version.outputs.version }}"
@@ -128,20 +182,24 @@ jobs:
           VERSION="${{ steps.version.outputs.version }}"
           TAG="${{ steps.version.outputs.tag }}"
           IMAGE_NAME="git.jusemon.com/jusemon/threejs-test:$VERSION"
-          COMMIT_HASH=$(git rev-parse HEAD)
+          # Use the version update commit hash (which has the correct version in files)
-          COMMIT_SHORT=$(git rev-parse --short HEAD)
+          COMMIT_HASH="${VERSION_COMMIT_HASH:-$(git rev-parse HEAD)}"
+          COMMIT_SHORT=$(git rev-parse --short "$COMMIT_HASH")
           BUILD_DATE=$(date -u +"%Y-%m-%d %H:%M:%S UTC")
           
-          # Get commits since last tag
+          # Get commits since last tag, excluding version update commits
           LATEST_TAG=$(git describe --tags --match 'v*.*.*' --abbrev=0 2>/dev/null || echo "")
           if [[ -n "$LATEST_TAG" ]]; then
-            COMMITS=$(git log ${LATEST_TAG}..HEAD --pretty=format:"- %s (%h)" --no-merges)
+            # Get commits excluding "chore: update version" commits (from previous releases)
+            # We want commits from the tag to the version update commit (exclusive of the version commit itself)
+            COMMITS=$(git log ${LATEST_TAG}..${COMMIT_HASH}^ --pretty=format:"- %s (%h)" --no-merges | grep -v "chore: update version")
           else
-            COMMITS=$(git log --pretty=format:"- %s (%h)" --no-merges -10)
+            # Get commits excluding version update commits
+            COMMITS=$(git log ${COMMIT_HASH}^ --pretty=format:"- %s (%h)" --no-merges -10 | grep -v "chore: update version")
           fi
           
-          # Get author of the commit
+          # Get author of the version update commit (or HEAD if no version commit)
-          COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an <%ae>")
+          COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an <%ae>" "$COMMIT_HASH")
           
           # Read template and replace placeholders
           TEMPLATE_FILE=".forgejo/release-template.md"
@@ -185,67 +243,21 @@ jobs:
           git config user.name "forgejo-actions"
           git config user.email "forgejo-actions@forgejo.io"
           TAG="${{ steps.version.outputs.tag }}"
+          # Use the version update commit hash (which has the correct version in files)
+          VERSION_COMMIT="${VERSION_COMMIT_HASH:-$(git rev-parse HEAD)}"
+          
           # Check if tag already exists
           if git rev-parse "$TAG" >/dev/null 2>&1; then
             echo "Tag $TAG already exists, skipping tag creation"
             echo "TAG_CREATED=false" >> $GITHUB_ENV
           else
-            git tag -a "$TAG" -F /tmp/release_message.txt
+            # Create tag pointing to the version update commit (which has correct VERSION file)
+            git tag -a "$TAG" -F /tmp/release_message.txt "$VERSION_COMMIT"
             git push origin "$TAG"
-            echo "Created tag $TAG with detailed release notes"
+            echo "Created tag $TAG pointing to version update commit $VERSION_COMMIT with detailed release notes"
             echo "TAG_CREATED=true" >> $GITHUB_ENV
           fi
 
-      - name: Update Version Files
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          TAG="${{ steps.version.outputs.tag }}"
-          
-          echo "📝 Updating version files to: $VERSION"
-          
-          # Configure git
-          git config user.name "forgebot"
-          git config user.email "forgebot@forgejo.io"
-          
-          # Fetch latest changes to avoid conflicts
-          git fetch origin main || echo "Fetch completed or already up to date"
-          git checkout main || echo "Already on main"
-          
-          # Update VERSION file
-          echo "$VERSION" > VERSION
-          
-          # Update portainer.yml with new version
-          sed -i "s|\(image: git.jusemon.com/jusemon/threejs-test:\)[0-9.]*|\1$VERSION|" portainer.yml
-          
-          # Verify the updates
-          if grep -q "^$VERSION$" VERSION && grep -q "image: git.jusemon.com/jusemon/threejs-test:$VERSION" portainer.yml; then
-            echo "✅ Successfully updated VERSION and portainer.yml to $VERSION"
-          else
-            echo "❌ Failed to update version files"
-            exit 1
-          fi
-          
-          # Check if there are changes to commit
-          if git diff --quiet VERSION portainer.yml; then
-            echo "⚠️ No changes to commit (files already up to date)"
-          else
-            # Stage and commit with [skip ci] to prevent infinite loop
-            # Note: Forgejo Actions should respect [skip ci] in commit messages
-            git add VERSION portainer.yml
-            git commit -m "chore: update version to $VERSION [skip ci]" || {
-              echo "⚠️ Commit failed (may already be committed)"
-              exit 0
-            }
-            
-            # Push to main branch (remote should already be configured with token)
-            git push origin main || {
-              echo "⚠️ Push failed (check token permissions)"
-              exit 0
-            }
-            
-            echo "✅ Successfully committed and pushed version update to $VERSION"
-          fi
-
       - name: Job Summary
         if: success()
         run: |

Dockerfile

@@ -11,6 +11,11 @@ RUN printf '{"version":"%s","buildDate":"%s"}\n' "${VERSION}" "${BUILD_DATE}" >
 COPY index.html /usr/share/nginx/html/
 COPY src/ /usr/share/nginx/html/src/
 
+# Copy and run cache busting script (bash/sed - no external dependencies needed)
+COPY build-cache-bust.sh /tmp/build-cache-bust.sh
+RUN chmod +x /tmp/build-cache-bust.sh && \
+    /tmp/build-cache-bust.sh "${VERSION}" /usr/share/nginx/html
+
 # Copy nginx configuration
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.4

build-cache-bust.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+# Simple cache busting script - adds version query params to all JS imports
+# Only runs during Docker build, not during local development
+# This keeps development simple (no tools needed) while ensuring production cache busting
+
+VERSION="${1:-dev}"
+SRC_DIR="${2:-/usr/share/nginx/html}"
+
+echo "Adding cache busting (v=${VERSION}) to JS imports in ${SRC_DIR}/src..."
+
+# Find all JS files and add version query param to relative imports
+find "$SRC_DIR/src" -type f -name "*.js" | while read -r file; do
+  # Skip if file doesn't exist
+  [ ! -f "$file" ] && continue
+  
+  # Process file with sed to add version query params
+  # Pattern: from './path.js' or from "../path.js" or import('./path.js')
+  # Only match relative imports (./ or ../) ending in .js
+  # Skip if already has query params (contains ?)
+  
+  # Handle single quote imports: from './path.js'
+  sed -i.bak \
+    -e "s|from '\\(\\.[./][^']*\\.js\\)'|from '\\1?v=${VERSION}'|g" \
+    -e "s|from '\\(\\.[./][^']*\\.js\\)?[^']*'|from '\\1?v=${VERSION}'|g" \
+    "$file"
+  
+  # Handle double quote imports: from "./path.js"
+  sed -i.bak \
+    -e "s|from \"\\(\\.[./][^\"]*\\.js\\)\"|from \"\\1?v=${VERSION}\"|g" \
+    -e "s|from \"\\(\\.[./][^\"]*\\.js\\)?[^\"]*\"|from \"\\1?v=${VERSION}\"|g" \
+    "$file"
+  
+  # Handle dynamic imports: import('./path.js')
+  sed -i.bak \
+    -e "s|import('\\(\\.[./][^']*\\.js\\)')|import('\\1?v=${VERSION}')|g" \
+    -e "s|import('\\(\\.[./][^']*\\.js\\)?[^']*')|import('\\1?v=${VERSION}')|g" \
+    -e "s|import(\"\\(\\.[./][^\"]*\\.js\\)\")|import(\"\\1?v=${VERSION}\")|g" \
+    -e "s|import(\"\\(\\.[./][^\"]*\\.js\\)?[^\"]*\")|import(\"\\1?v=${VERSION}\")|g" \
+    "$file"
+  
+  # Remove backup file
+  rm -f "${file}.bak"
+done
+
+echo "Cache busting complete! All JS imports now include ?v=${VERSION}"
+

index.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>3D Coin Collector Game</title>
     <style>
       * {
@@ -12,7 +12,7 @@
       }
       body {
         overflow: hidden;
-            font-family: 'Arial', sans-serif;
+        font-family: "Arial", sans-serif;
         background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
       }
       #ui {
@@ -21,7 +21,7 @@
         left: 20px;
         color: white;
         font-size: 24px;
-            text-shadow: 2px 2px 4px rgba(0,0,0,0.5);
+        text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
         z-index: 100;
       }
       #combo {
@@ -29,56 +29,70 @@
         top: 100px;
         left: 50%;
         transform: translateX(-50%);
-            color: #FFD700;
+        color: #ffd700;
         font-size: 32px;
         font-weight: bold;
-            text-shadow: 2px 2px 4px rgba(0,0,0,0.8);
+        text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.8);
         z-index: 100;
         display: none;
         animation: comboPulse 0.5s ease-in-out;
       }
       @keyframes comboPulse {
-            0%, 100% { transform: translateX(-50%) scale(1); }
+        0%,
-            50% { transform: translateX(-50%) scale(1.2); }
+        100% {
+          transform: translateX(-50%) scale(1);
         }
-        #startMenu, #pauseMenu, #gameOver {
+        50% {
+          transform: translateX(-50%) scale(1.2);
+        }
+      }
+      #startMenu,
+      #pauseMenu,
+      #gameOver {
         position: absolute;
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
-            background: rgba(0,0,0,0.9);
+        background: rgba(0, 0, 0, 0.9);
         padding: 50px;
         border-radius: 20px;
         text-align: center;
         color: white;
         z-index: 200;
         min-width: 400px;
-            box-shadow: 0 10px 40px rgba(0,0,0,0.5);
+        box-shadow: 0 10px 40px rgba(0, 0, 0, 0.5);
       }
       #startMenu {
         display: block;
       }
-        #pauseMenu, #gameOver {
+      #pauseMenu,
+      #gameOver {
         display: none;
       }
-        #startMenu h1, #pauseMenu h1, #gameOver h1 {
+      #startMenu h1,
+      #pauseMenu h1,
+      #gameOver h1 {
         font-size: 48px;
         margin-bottom: 20px;
-            color: #4CAF50;
+        color: #4caf50;
       }
       #pauseMenu h1 {
-            color: #FFA500;
+        color: #ffa500;
       }
       #gameOver h1 {
         color: #ff6b6b;
       }
-        #startMenu p, #pauseMenu p, #gameOver p {
+      #startMenu p,
+      #pauseMenu p,
+      #gameOver p {
         font-size: 20px;
         margin-bottom: 30px;
         line-height: 1.6;
       }
-        #startMenu button, #pauseMenu button, #restartBtn {
+      #startMenu button,
-            background: #4CAF50;
+      #pauseMenu button,
+      #restartBtn {
+        background: #4caf50;
         border: none;
         color: white;
         padding: 15px 40px;
@@ -88,15 +102,17 @@
         transition: all 0.3s;
         margin: 10px;
       }
-        #startMenu button:hover, #pauseMenu button:hover, #restartBtn:hover {
+      #startMenu button:hover,
+      #pauseMenu button:hover,
+      #restartBtn:hover {
         background: #45a049;
         transform: scale(1.1);
       }
       #pauseMenu button.resumeBtn {
-            background: #2196F3;
+        background: #2196f3;
       }
       #pauseMenu button.resumeBtn:hover {
-            background: #1976D2;
+        background: #1976d2;
       }
       #instructions {
         position: absolute;
@@ -105,7 +121,7 @@
         transform: translateX(-50%);
         color: white;
         text-align: center;
-            text-shadow: 2px 2px 4px rgba(0,0,0,0.5);
+        text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
       }
       #version {
         position: absolute;
@@ -113,16 +129,16 @@
         right: 20px;
         color: rgba(255, 255, 255, 0.7);
         font-size: 14px;
-            text-shadow: 2px 2px 4px rgba(0,0,0,0.5);
+        text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
         z-index: 100;
-            font-family: 'Courier New', monospace;
+        font-family: "Courier New", monospace;
       }
       #soundStatus {
         display: none;
         position: absolute;
         top: 20px;
         right: 90px;
-            background: rgba(0,0,0,0.7);
+        background: rgba(0, 0, 0, 0.7);
         border: 2px solid white;
         color: white;
         font-size: 24px;
@@ -135,7 +151,7 @@
         user-select: none;
       }
       #soundStatus:hover {
-            background: rgba(0,0,0,0.9);
+        background: rgba(0, 0, 0, 0.9);
         transform: scale(1.1);
       }
       #soundStatus:active {
@@ -146,7 +162,7 @@
         position: absolute;
         top: 20px;
         right: 20px;
-            background: rgba(0,0,0,0.7);
+        background: rgba(0, 0, 0, 0.7);
         border: 2px solid white;
         color: white;
         font-size: 24px;
@@ -158,7 +174,7 @@
         transition: all 0.2s;
       }
       #pauseBtn:hover {
-            background: rgba(0,0,0,0.9);
+        background: rgba(0, 0, 0, 0.9);
         transform: scale(1.1);
       }
       #pauseBtn:active {
@@ -179,7 +195,7 @@
         border-radius: 5px;
         color: #00ff00;
         font-size: 12px;
-            font-family: 'Courier New', monospace;
+        font-family: "Courier New", monospace;
         z-index: 100;
         display: none;
         min-width: 120px;
@@ -218,9 +234,9 @@
         }
       }
     </style>
-</head>
+  </head>
-<body>
+  <body>
-    <div id="ui" style="display: none;">
+    <div id="ui" style="display: none">
       <div>Score: <span id="score">0</span></div>
       <div>High Score: <span id="highScore">0</span></div>
       <div>Health: <span id="health">100</span></div>
@@ -236,17 +252,21 @@
 
     <div id="perfMonitor">
       <div><span class="label">FPS:</span> <span id="fps">60</span></div>
-        <div><span class="label">Frame:</span> <span id="frameTime">16.7</span>ms</div>
+      <div>
-        <div><span class="label">Entities:</span> <span id="entityCount">0</span></div>
+        <span class="label">Frame:</span> <span id="frameTime">16.7</span>ms
+      </div>
+      <div>
+        <span class="label">Entities:</span> <span id="entityCount">0</span>
+      </div>
     </div>
 
     <div id="startMenu">
       <h1>🎮 Coin Collector</h1>
       <p>Collect coins, avoid obstacles, and survive as long as you can!</p>
-        <p style="font-size: 16px; opacity: 0.8; margin-top: 20px;">
+      <p style="font-size: 16px; opacity: 0.8; margin-top: 20px">
-            <strong>Controls:</strong><br>
+        <strong>Controls:</strong><br />
-            WASD or Arrow Keys to move<br>
+        WASD or Arrow Keys to move<br />
-            Touch and drag (mobile)<br>
+        Touch and drag (mobile)<br />
         ESC or P to pause
       </p>
       <button id="startBtn">Start Game</button>
@@ -261,29 +281,66 @@
 
     <div id="gameOver">
       <h1>Game Over!</h1>
-        <p id="newHighScore" style="display: none; color: #FFD700; font-size: 28px; margin-bottom: 10px;">🏆 New High Score! 🏆</p>
+      <p
+        id="newHighScore"
+        style="
+          display: none;
+          color: #ffd700;
+          font-size: 28px;
+          margin-bottom: 10px;
+        "
+      >
+        🏆 New High Score! 🏆
+      </p>
       <p>Final Score: <span id="finalScore">0</span></p>
       <button id="restartBtn">Play Again</button>
     </div>
 
-    <div id="instructions" style="display: none;">
+    <div id="instructions" style="display: none">
-        <p><strong>Controls:</strong> WASD or Arrow Keys to move | Touch and drag to move (mobile) | Collect yellow coins | Avoid red obstacles!</p>
+      <p>
-        <p style="margin-top: 5px; font-size: 11px; opacity: 0.7;">Press "T" to toggle performance monitor | Press "M" to toggle sound | Press "ESC" or "P" to pause</p>
+        <strong>Controls:</strong> WASD or Arrow Keys to move | Touch and drag
+        to move (mobile) | Collect yellow coins | Avoid red obstacles!
+      </p>
+      <p style="margin-top: 5px; font-size: 11px; opacity: 0.7">
+        Press "T" to toggle performance monitor | Press "M" to toggle sound |
+        Press "ESC" or "P" to pause
+      </p>
     </div>
 
     <script type="module">
       // Import Three.js from CDN
 
-        import * as THREE from 'https://cdn.jsdelivr.net/npm/three@0.181.2/build/three.module.js';
+      import * as THREE from "https://cdn.jsdelivr.net/npm/three@0.181.2/build/three.module.js";
 
       // Make THREE globally available for our modules
       window.THREE = THREE;
 
-        // Load the game after THREE is loaded
+      // Load version for cache busting
-        import('./src/main.js').catch(err => {
+      async function loadGame() {
-            console.error('Failed to load game:', err);
+        try {
+          // Try to get version from version.json for cache busting
+          const versionResponse = await fetch(`/version.json?t=${Date.now()}`, {
+            cache: "no-store",
           });
-    </script>
+          let cacheBuster = `?t=${Date.now()}`;
-</body>
-</html>
 
+          if (versionResponse.ok) {
+            const versionData = await versionResponse.json();
+            if (versionData.version) {
+              // Use version for cache busting (more reliable than timestamp)
+              cacheBuster = `?v=${versionData.version}`;
+            }
+          }
+
+          // Load the game with cache busting
+          await import(`./src/main.js${cacheBuster}`);
+        } catch (err) {
+          console.error("Failed to load game:", err);
+        }
+      }
+
+      // Load the game after THREE is loaded
+      loadGame();
+    </script>
+  </body>
+</html>

nginx.conf

@@ -9,11 +9,19 @@ server {
         try_files $uri $uri/ =404;
     }
     
-    # Prevent caching of JavaScript files and version.json
+    # Cache JavaScript files with version query params for 1 year (immutable)
-    location ~* \.(js|mjs)$ {
+    # Files without version params are not cached
+    location ~* \.(js|mjs)(\?v=[^&]+)?$ {
+        if ($args ~ "v=") {
+            # Has version param - cache for 1 year (immutable)
+            add_header Cache-Control "public, max-age=31536000, immutable";
+        }
+        if ($args !~ "v=") {
+            # No version param - don't cache
             add_header Cache-Control "no-cache, no-store, must-revalidate";
             add_header Pragma "no-cache";
             add_header Expires "0";
+        }
         add_header Vary "Accept-Encoding";
     }
     

portainer.yml

@@ -2,7 +2,7 @@ name: threejs-test
 
 services:
   app:
-    image: git.jusemon.com/jusemon/threejs-test:1.0.0
+    image: git.jusemon.com/jusemon/threejs-test:1.0.4
     restart: unless-stopped
 
 networks: