feat: partial upgrade to 3.25

Vilsol · Jul 24, 2024 · 3b20af5 · 3b20af5
1 parent 8cce491
commit 3b20af5
Show file tree

Hide file tree

Showing 17 changed files with 719 additions and 712 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -4,27 +4,18 @@ permissions: read-all
 
 on: [push, pull_request]
 
-env:
-  NODE_VERSION: "18"
-  PNPM_VERSION: "8.5.1"
-  GO_VERSION: "1.21.0"
-
 jobs:
   lint-backend:
     name: Lint Backend
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+          go-version-file: 'go.mod'
 
-      - name: Check out code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Lint
-        uses: golangci/golangci-lint-action@v2
+      - uses: golangci/golangci-lint-action@v6
         with:
           skip-pkg-cache: true
           skip-build-cache: true
@@ -34,37 +25,30 @@ jobs:
     name: Lint Frontend
     runs-on: ubuntu-latest
     steps:
-      - name: Setup nodejs
-        uses: actions/setup-node@v1
+      - uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version-file: 'frontend/.nvmrc'
 
-      - name: Check out code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Install pnpm
-        uses: pnpm/[email protected]
-        with:
-          version: ${{ env.PNPM_VERSION }}
-          run_install: |
-            - cwd: frontend
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Lint
         working-directory: ./frontend
-        run: pnpm run lint
+        run: |
+          pnpm install
+          pnpm run lint
 
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+          go-version-file: 'go.mod'
 
-      - name: Check out code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Test
         run: go test -v ./...
@@ -75,14 +59,11 @@ jobs:
     needs:
       - lint-backend
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+          go-version-file: 'go.mod'
 
-      - name: Check out
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Build wasm
         run: go build -ldflags="-s -w" -v -o build.wasm ./wasm
@@ -96,20 +77,17 @@ jobs:
     needs:
       - lint-frontend
     steps:
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version-file: 'frontend/.nvmrc'
 
-      - name: Check out
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Install pnpm
-        uses: pnpm/[email protected]
-        with:
-          version: ${{ env.PNPM_VERSION }}
-          run_install: |
-            - cwd: frontend
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Build frontend
         working-directory: frontend
-        run: pnpm run build
+        run: |
+          pnpm install
+          pnpm run build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,35 +5,23 @@ on:
     tags:
       - v*
 
-env:
-  NODE_VERSION: "18"
-  PNPM_VERSION: "8.5.1"
-  GO_VERSION: "1.21.0"
-
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
-          stable: false
+          go-version-file: 'go.mod'
 
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version-file: 'frontend/.nvmrc'
 
-      - name: Check out
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Install pnpm
-        uses: pnpm/[email protected]
-        with:
-          version: ${{ env.PNPM_VERSION }}
-          run_install: |
-            - cwd: frontend
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Build wasm
         run: go build -ldflags="-s -w" -v -o frontend/static/calculator.wasm ./wasm
@@ -44,11 +32,11 @@ jobs:
       - name: Build frontend
         working-directory: frontend
         run: |
+          pnpm install
           pnpm run build
           ls -lah build
 
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+      - uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./frontend/build

diff --git a/README.md b/README.md
@@ -4,4 +4,17 @@ A simple timeless jewel calculator with a skill tree view
 
 Hosted Version: [https://vilsol.github.io/timeless-jewels](https://vilsol.github.io/timeless-jewels)
 
-Uses data extracted with https://github.com/Vilsol/go-pob-data
+Uses data extracted with https://github.com/Vilsol/go-pob-data
+
+## Updates to new leagues
+
+Whenever a new league is coming, the passive tree might get updated.
+**But** it is not guaranteed to contain correct data until a game download is available.
+
+Specifically, this project depends on the following data tables:
+
+* Alternate Passive Additions
+* Alternate Passive Skills
+* Passive Skills
+* Stats
+* Translations
diff --git a/data/SkillTree.json.gz b/data/SkillTree.json.gz
diff --git a/data/passive_skill_aura_stat_descriptions.json.gz b/data/passive_skill_aura_stat_descriptions.json.gz
diff --git a/data/passive_skill_stat_descriptions.json.gz b/data/passive_skill_stat_descriptions.json.gz
diff --git a/data/passive_skills.json.gz b/data/passive_skills.json.gz
diff --git a/data/possible_stats.json.gz b/data/possible_stats.json.gz
diff --git a/data/stat_descriptions.json.gz b/data/stat_descriptions.json.gz
diff --git a/data/stats.json.gz b/data/stats.json.gz
diff --git a/devbox.json b/devbox.json
@@ -1,13 +1,9 @@
 {
-  "packages": ["[email protected]"],
-  "shell": {
-    "init_hook": [
-      "echo 'Welcome to devbox!' > /dev/null"
-    ],
-    "scripts": {
-      "test": [
-        "echo \"Error: no test specified\" && exit 1"
-      ]
-    }
+  "packages": [
+    "[email protected]",
+    "[email protected]"
+  ],
+  "env": {
+    "DEVBOX_COREPACK_ENABLED": "true"
   }
 }
diff --git a/devbox.lock b/devbox.lock
@@ -1,23 +1,116 @@
 {
   "lockfile_version": "1",
   "packages": {
-    "go@1.19.13": {
-      "last_modified": "2024-01-27T14:55:31Z",
-      "resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#go_1_19",
+    "go@1.22.5": {
+      "last_modified": "2024-07-07T07:43:47Z",
+      "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#go",
       "source": "devbox-search",
-      "version": "1.19.13",
+      "version": "1.22.5",
       "systems": {
         "aarch64-darwin": {
-          "store_path": "/nix/store/2llf3dn2m48q6cral32bd8mk1g5pa48d-go-1.19.13"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/05saqcgidraqmn4z82prsp7rbj9hjmwm-go-1.22.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/05saqcgidraqmn4z82prsp7rbj9hjmwm-go-1.22.5"
         },
         "aarch64-linux": {
-          "store_path": "/nix/store/5fysyzw0baj5kprrf94iz0p733c4b5w1-go-1.19.13"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/b97bbxn6kpysysxb8nxn4k39ffxmp4p6-go-1.22.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/b97bbxn6kpysysxb8nxn4k39ffxmp4p6-go-1.22.5"
         },
         "x86_64-darwin": {
-          "store_path": "/nix/store/4zq38z7s23nn9pyibb4qkyb90bna9prr-go-1.19.13"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/gdyii59c48s4a8q6w584ccgm95qls3lh-go-1.22.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/gdyii59c48s4a8q6w584ccgm95qls3lh-go-1.22.5"
         },
         "x86_64-linux": {
-          "store_path": "/nix/store/ra7zh0hq3gzw7pdmb3ixvr5zd6h8qc9h-go-1.19.13"
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/3v17dij8rvg7q99009swxg52995r7s22-go-1.22.5",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/3v17dij8rvg7q99009swxg52995r7s22-go-1.22.5"
+        }
+      }
+    },
+    "[email protected]": {
+      "last_modified": "2024-07-07T07:43:47Z",
+      "plugin_version": "0.0.2",
+      "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#nodejs_18",
+      "source": "devbox-search",
+      "version": "18.20.2",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/2n9c55cd1376ajbrfcc3bpicdh82hglb-nodejs-18.20.2",
+              "default": true
+            },
+            {
+              "name": "libv8",
+              "path": "/nix/store/ymf7b294cf6hvw8dcs4km4z7w7vwx8y9-nodejs-18.20.2-libv8"
+            }
+          ],
+          "store_path": "/nix/store/2n9c55cd1376ajbrfcc3bpicdh82hglb-nodejs-18.20.2"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/y6pr2gldc02pk6ghm1fapbsvhhjf2kpa-nodejs-18.20.2",
+              "default": true
+            },
+            {
+              "name": "libv8",
+              "path": "/nix/store/dzllw2vxgsr8s4m2lng602q8p0nq0cnf-nodejs-18.20.2-libv8"
+            }
+          ],
+          "store_path": "/nix/store/y6pr2gldc02pk6ghm1fapbsvhhjf2kpa-nodejs-18.20.2"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/qpg8a1hsz2jihxy0by0wq5p6wjk22fyg-nodejs-18.20.2",
+              "default": true
+            },
+            {
+              "name": "libv8",
+              "path": "/nix/store/is0y2rgkf3mfvfg20r9ya12515yss9dm-nodejs-18.20.2-libv8"
+            }
+          ],
+          "store_path": "/nix/store/qpg8a1hsz2jihxy0by0wq5p6wjk22fyg-nodejs-18.20.2"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/kr6p8nmj3y4wmfm3q6f0j8yd2zb2lxaj-nodejs-18.20.2",
+              "default": true
+            },
+            {
+              "name": "libv8",
+              "path": "/nix/store/3f2q1pvz9s2sqdk4z7k9wq88rk8vrscd-nodejs-18.20.2-libv8"
+            }
+          ],
+          "store_path": "/nix/store/kr6p8nmj3y4wmfm3q6f0j8yd2zb2lxaj-nodejs-18.20.2"
         }
       }
     }

diff --git a/frontend/.nvmrc b/frontend/.nvmrc
@@ -0,0 +1 @@
+22.3.0
diff --git a/frontend/src/app.html b/frontend/src/app.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <title>Timeless Jewel Calculator</title>
-    <meta property="description" content="Timeless Jewel calculator with a passive tree view" />
+    <meta name="description" content="Timeless Jewel calculator with a passive tree view" />
 
     <meta property="og:title" content="Timeless Jewel Calculator" />
     <meta property="og:image" content="%sveltekit.assets%/favicon.png" />

diff --git a/frontend/src/routes/tree/+page.svelte b/frontend/src/routes/tree/+page.svelte
@@ -447,7 +447,12 @@
             </button>
 
             <h3 class="flex-grow">
-              {results ? 'Results' : 'Timeless Jewel'}
+              {#if results}
+                <span>Results</span>
+              {:else}
+                <span>Timeless Jewel</span>
+                <span class="text-red-500"> - NOT FULLY UP TO DATE FOR 3.25</span>
+              {/if}
             </h3>
           </div>
           {#if searchResults}