Merge branch 'beta' into prabbyd4668

.gitattributes

@@ -1,2 +1,3 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+* -crlf

.github/workflows/deploy-beta.yml

@@ -15,7 +15,7 @@ jobs:
           submodules: 'recursive'
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version-file: '.nvmrc'
       - name: Install dependencies
         run: npm ci
       - name: Build

.github/workflows/deploy.yml

@@ -18,7 +18,7 @@ jobs:
           submodules: 'recursive'
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version-file: '.nvmrc'
       - name: Install dependencies
         run: npm ci
       - name: Build

.github/workflows/github-pages.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository for Typedoc
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: 'recursive'
           path: pokerogue_docs
@@ -34,14 +34,14 @@ jobs:
           sudo apt update
           sudo apt install -y git openssh-client
 
-      - name: Setup Node 20.13.1
+      - name: Setup Node 22.14.1
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: "pokerogue_docs/.nvmrc"
 
       - name: Checkout repository for Github Pages
         if: github.event_name == 'push'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: pokerogue_gh
           ref: gh-pages

.github/workflows/quality.yml

@@ -29,6 +29,7 @@ jobs:
         uses: actions/setup-node@v4  # Use the setup-node action version 4
         with:
           node-version-file: '.nvmrc'
+          cache: 'npm'
 
       - name: Install Node.js dependencies  # Step to install Node.js dependencies
         run: npm ci  # Use 'npm ci' to install dependencies

.github/workflows/test-shard-template.yml

@@ -19,14 +19,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.2
         with:
           submodules: 'recursive'
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: '.nvmrc'
+          cache: 'npm'
       - name: Install Node.js dependencies
         run: npm ci
       - name: Run tests
-        run: npx vitest --project ${{ inputs.project }} --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}
+        run: npx vitest --project ${{ inputs.project }} --no-isolate --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}

.github/workflows/tests.yml

@@ -7,37 +7,56 @@ on:
     branches:
       - main # Trigger on push events to the main branch
       - beta # Trigger on push events to the beta branch
+    # go upvote https://github.com/actions/runner/issues/1182 and yell at microsoft until they fix this or ditch yml for workflows
+    paths:
+      # src and test files
+      - "src/**"
+      - "test/**"
+      - "public/**"
+      # Workflows that can impact tests
+      - ".github/workflows/test*.yml"
+      # top-level files
+      - "package*.json"
+      - ".nvrmc" # Updates to node version can break tests
+      - "vite.*.ts" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts
+      - "tsconfig*.json" # tsconfig.json tweaking can impact compilation
+      - "global.d.ts"
+      - ".env.*"
+      # Blanket negations for files that cannot impact tests
+      - "!**/*.py" # No .py files
+      - "!**/*.sh" # No .sh files
+      - "!**/*.md" # No .md files
+      - "!**/.git*" # .gitkeep and family
+
   pull_request:
     branches:
       - main # Trigger on pull request events targeting the main branch
       - beta # Trigger on pull request events targeting the beta branch
+    paths: # go upvote https://github.com/actions/runner/issues/1182 and yell at microsoft because until then we have to duplicate this
+      # src and test files
+      - "src/**"
+      - "test/**"
+      - "public/**"
+      # Workflows that can impact tests
+      - ".github/workflows/test*.yml"
+      # top-level files
+      - "package*.json"
+      - ".nvrmc" # Updates to node version can break tests
+      - "vite*" # vite.config.ts, vite.vitest.config.ts, vitest.workspace.ts
+      - "tsconfig*.json" # tsconfig.json tweaking can impact compilation
+      - "global.d.ts"
+      - ".env.*"
+      # Blanket negations for files that cannot impact tests
+      - "!**/*.py" # No .py files
+      - "!**/*.sh" # No .sh files
+      - "!**/*.md" # No .md files
+      - "!**/.git*" # .gitkeep and family
   merge_group:
     types: [checks_requested]
 
 jobs:
-  pre-test:
-    name: Run Pre-test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-          path: tests-action
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        working-directory: tests-action
-        run: npm ci
-      - name: Run Pre-test
-        working-directory: tests-action
-        run: npx vitest run --project pre ${{ !runner.debug && '--silent' || '' }}
-
   run-tests:
     name: Run Tests
-    needs: [pre-test]
     strategy:
       matrix:
         shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]

.nvmrc

@@ -1 +1 @@
-v20.13.1
+v22.14.0

README.md

@@ -12,7 +12,7 @@ If you have the motivation and experience with Typescript/Javascript (or are wil
 
 #### Prerequisites
 
-- node: 20.13.1
+- node: 22.14.0
 - npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
 
 #### Running Locally

biome.jsonc

@@ -31,7 +31,7 @@
       "src/overrides.ts",
       // TODO: these files are too big and complex, ignore them until their respective refactors
       "src/data/moves/move.ts",
-      "src/data/ability.ts",
+      "src/data/abilities/ability.ts",
       "src/field/pokemon.ts",
 
       // this file is just too big:
@@ -50,7 +50,8 @@
         "noUndeclaredVariables": "off",
         "noUnusedVariables": "error",
         "noSwitchDeclarations": "warn", // TODO: refactor and make this an error
-        "noVoidTypeReturn": "warn" // TODO: Refactor and make this an error
+        "noVoidTypeReturn": "warn", // TODO: Refactor and make this an error
+        "noUnusedImports": "error"
       },
       "style": {
         "noVar": "error",
@@ -64,7 +65,8 @@
         "useDefaultParameterLast": "off", // TODO: Fix spots in the codebase where this flag would be triggered, and then enable
         "useSingleVarDeclarator": "off",
         "useNodejsImportProtocol": "off",
-        "useTemplate": "off" // string concatenation is faster: https://stackoverflow.com/questions/29055518/are-es6-template-literals-faster-than-string-concatenation
+        "useTemplate": "off", // string concatenation is faster: https://stackoverflow.com/questions/29055518/are-es6-template-literals-faster-than-string-concatenation
+        "noNamespaceImport": "error"
       },
       "suspicious": {
         "noDoubleEquals": "error",
@@ -98,6 +100,9 @@
         "rules": {
           "performance": {
             "noDelete": "off"
+          },
+          "style": {
+            "noNamespaceImport": "off"
           }
         }
       }

index.css

@@ -68,6 +68,10 @@ input:-internal-autofill-selected {
   background-clip: text;
 }
 
+input:-webkit-autofill {
+  -webkit-text-fill-color: #a1a1a1;
+}
+
 /* Need adjust input font-size */
 input {
   font-size: 3.2rem;

lefthook.yml

@@ -9,12 +9,6 @@ pre-commit:
         - merge
         - rebase
       
-pre-push:
-  commands:
-    biome-lint:
-      glob: "*.{js,ts,jsx,tsx}"
-      run: npx @biomejs/biome check --write --reporter=summary {push_files} --no-errors-on-unmatched
-      
 post-merge:
   commands:
     update-submodules:

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.7.7",
+  "version": "1.8.4",
   "type": "module",
   "scripts": {
     "start": "vite",
@@ -9,10 +9,10 @@
     "build": "vite build",
     "build:beta": "vite build --mode beta",
     "preview": "vite preview",
-    "test": "vitest run --project pre && vitest run --project main",
+    "test": "vitest run",
-    "test:cov": "vitest run --project pre && vitest run --project main --coverage",
+    "test:cov": "vitest run --coverage --no-isolate",
-    "test:watch": "vitest run --project pre && vitest watch --project main --coverage",
+    "test:watch": "vitest watch --coverage --no-isolate",
-    "test:silent": "vitest run --project pre && vitest run --project main --silent",
+    "test:silent": "vitest run --silent --no-isolate",
     "typecheck": "tsc --noEmit",
     "eslint": "eslint --fix .",
     "eslint-ci": "eslint .",
@@ -29,43 +29,44 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@eslint/js": "^9.3.0",
+    "@eslint/js": "^9.23.0",
-    "@hpcc-js/wasm": "^2.18.0",
+    "@hpcc-js/wasm": "^2.22.4",
-    "@stylistic/eslint-plugin-ts": "^2.6.0-beta.0",
+    "@stylistic/eslint-plugin-ts": "^4.1.0",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^20.12.13",
+    "@types/node": "^22.13.14",
-    "@typescript-eslint/eslint-plugin": "^8.0.0-alpha.54",
+    "@typescript-eslint/eslint-plugin": "^8.28.0",
-    "@typescript-eslint/parser": "^8.0.0-alpha.54",
+    "@typescript-eslint/parser": "^8.28.0",
-    "@vitest/coverage-istanbul": "^2.1.9",
+    "@vitest/coverage-istanbul": "^3.0.9",
     "dependency-cruiser": "^16.3.10",
-    "eslint": "^9.7.0",
+    "eslint": "^9.23.0",
-    "eslint-plugin-import-x": "^4.2.1",
+    "eslint-plugin-import-x": "^4.9.4",
-    "inquirer": "^11.0.2",
+    "inquirer": "^12.4.2",
-    "jsdom": "^24.0.0",
+    "jsdom": "^26.0.0",
-    "lefthook": "^1.6.12",
+    "lefthook": "^1.11.5",
-    "msw": "^2.4.9",
+    "msw": "^2.7.3",
     "phaser3spectorjs": "^0.0.8",
-    "typedoc": "^0.26.4",
+    "typedoc": "^0.28.1",
-    "typescript": "^5.5.3",
+    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.0.0-alpha.54",
+    "typescript-eslint": "^8.28.0",
-    "vite": "^5.4.14",
+    "vite": "^6.2.0",
-    "vite-tsconfig-paths": "^4.3.2",
+    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^2.1.9",
+    "vitest": "^3.0.9",
     "vitest-canvas-mock": "^0.3.3"
   },
   "dependencies": {
     "@material/material-color-utilities": "^0.2.7",
+    "compare-versions": "^6.1.1",
     "crypto-js": "^4.2.0",
-    "i18next": "^23.11.1",
+    "i18next": "^24.2.2",
-    "i18next-browser-languagedetector": "^7.2.1",
+    "i18next-browser-languagedetector": "^8.0.4",
-    "i18next-http-backend": "^2.6.1",
+    "i18next-http-backend": "^3.0.2",
     "i18next-korean-postposition-processor": "^1.0.0",
-    "json-stable-stringify": "^1.1.0",
+    "json-stable-stringify": "^1.2.0",
     "jszip": "^3.10.1",
     "phaser": "^3.70.0",
-    "phaser3-rex-plugins": "^1.1.84"
+    "phaser3-rex-plugins": "^1.80.14"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   }
 }

public/exp-sprites.json

@@ -13,10 +13,10 @@
     "1005",
     "1006",
     "1006",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1008-ultimate",
+    "1008-ultimate-mode-Disabled",
-    "1008-ultimate",
+    "1008-ultimate-mode-Disabled",
     "115-mega",
     "115-mega",
     "127-mega",
@@ -185,9 +185,9 @@
     "531-mega",
     "569-gigantamax",
     "569-gigantamax",
-    "6-mega",
-    "6-mega",
     "6-mega-x",
+    "6-mega-x",
+    "6-mega-y",
     "6-mega-y",
     "6058",
     "6058",
@@ -825,8 +825,8 @@
     "873",
     "874",
     "874",
-    "875-no",
+    "875-no-ice",
-    "875-no",
+    "875-no-ice",
     "875",
     "875",
     "876-female",
@@ -963,26 +963,26 @@
     "929",
     "930",
     "930",
-    "931-blue",
+    "931-blue-plumage-Disabled",
-    "931-blue",
+    "931-blue-plumage-Disabled",
-    "931-green",
+    "931-green-plumage-Disabled",
-    "931-green",
+    "931-green-plumage-Disabled",
-    "931-white",
+    "931-white-plumage-Disabled",
-    "931-white",
+    "931-white-plumage-Disabled",
-    "931-yellow",
+    "931-yellow-plumage-Disabled",
-    "931-yellow",
+    "931-yellow-plumage-Disabled",
     "932",
     "932",
     "933",
     "933",
     "934",
     "934",
-    "935",
+    "935-Disabled",
-    "935",
+    "935-Disabled",
-    "936",
+    "936-Disabled",
-    "936",
+    "936-Disabled",
-    "937",
+    "937-Disabled",
-    "937",
+    "937-Disabled",
     "938",
     "938",
     "939",
@@ -1073,6 +1073,8 @@
     "978-droopy",
     "978-stretchy",
     "978-stretchy",
+    "979-Disabled",
+    "979-Disabled",
     "980",
     "980",
     "981",
@@ -1131,10 +1133,10 @@
     "1005b",
     "1006b",
     "1006b",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1008b-ultimate",
+    "1008b-ultimate-mode-Disabled",
-    "1008b-ultimate",
+    "1008b-ultimate-mode-Disabled",
     "115b-mega",
     "115b-mega",
     "127b-mega",
@@ -1303,9 +1305,9 @@
     "531b-mega",
     "569b-gigantamax",
     "569b-gigantamax",
-    "6b-mega",
-    "6b-mega",
     "6b-mega-x",
+    "6b-mega-x",
+    "6b-mega-y",
     "6b-mega-y",
     "6058b",
     "6058b",
@@ -1943,8 +1945,8 @@
     "873b",
     "874b",
     "874b",
-    "875b-no",
+    "875b-no-ice",
-    "875b-no",
+    "875b-no-ice",
     "875b",
     "875b",
     "876b-female",
@@ -2083,26 +2085,26 @@
     "929b",
     "930b",
     "930b",
-    "931b-blue",
+    "931b-blue-plumage-Disabled",
-    "931b-blue",
+    "931b-blue-plumage-Disabled",
-    "931b-green",
+    "931b-green-plumage-Disabled",
-    "931b-green",
+    "931b-green-plumage-Disabled",
-    "931b-white",
+    "931b-white-plumage-Disabled",
-    "931b-white",
+    "931b-white-plumage-Disabled",
-    "931b-yellow",
+    "931b-yellow-plumage-Disabled",
-    "931b-yellow",
+    "931b-yellow-plumage-Disabled",
     "932b",
     "932b",
     "933b",
     "933b",
     "934b",
     "934b",
-    "935b",
+    "935b-Disabled",
-    "935b",
+    "935b-Disabled",
-    "936b",
+    "936b-Disabled",
-    "936b",
+    "936b-Disabled",
-    "937b",
+    "937b-Disabled",
-    "937b",
+    "937b-Disabled",
     "938b",
     "938b",
     "939b",
@@ -2251,10 +2253,10 @@
     "1005sb",
     "1006sb",
     "1006sb",
-    "1007sb-apex",
+    "1007sb-apex-build-Disabled",
-    "1007sb-apex",
+    "1007sb-apex-build-Disabled",
-    "1008sb-ultimate",
+    "1008sb-ultimate-mode-Disabled",
-    "1008sb-ultimate",
+    "1008sb-ultimate-mode-Disabled",
     "115sb-mega",
     "115sb-mega",
     "127sb-mega",
@@ -3063,8 +3065,8 @@
     "873sb",
     "874sb",
     "874sb",
-    "875sb-no",
+    "875sb-no-ice",
-    "875sb-no",
+    "875sb-no-ice",
     "875sb",
     "875sb",
     "876sb-female",
@@ -3203,26 +3205,26 @@
     "929sb",
     "930sb",
     "930sb",
-    "931sb-blue",
+    "931sb-blue-plumage-Disabled",
-    "931sb-blue",
+    "931sb-blue-plumage-Disabled",
-    "931sb-green",
+    "931sb-green-plumage-Disabled",
-    "931sb-green",
+    "931sb-green-plumage-Disabled",
-    "931sb-white",
+    "931sb-white-plumage-Disabled",
-    "931sb-white",
+    "931sb-white-plumage-Disabled",
-    "931sb-yellow",
+    "931sb-yellow-plumage-Disabled",
-    "931sb-yellow",
+    "931sb-yellow-plumage-Disabled",
     "932sb",
     "932sb",
     "933sb",
     "933sb",
     "934sb",
     "934sb",
-    "935sb",
+    "935sb-Disabled",
-    "935sb",
+    "935sb-Disabled",
-    "936sb",
+    "936sb-Disabled",
-    "936sb",
+    "936sb-Disabled",
-    "937sb",
+    "937sb-Disabled",
-    "937sb",
+    "937sb-Disabled",
     "938sb",
     "938sb",
     "939sb",
@@ -3376,10 +3378,10 @@
     "1005s",
     "1006s",
     "1006s",
-    "1007s-apex",
+    "1007s-apex-build-Disabled",
-    "1007s-apex",
+    "1007s-apex-build-Disabled",
-    "1008s-ultimate",
+    "1008s-ultimate-mode-Disabled",
-    "1008s-ultimate",
+    "1008s-ultimate-mode-Disabled",
     "115s-mega",
     "115s-mega",
     "127s-mega",
@@ -4188,8 +4190,8 @@
     "873s",
     "874s",
     "874s",
-    "875s-no",
+    "875s-no-ice",
-    "875s-no",
+    "875s-no-ice",
     "875s",
     "875s",
     "876s-female",
@@ -4328,26 +4330,26 @@
     "929s",
     "930s",
     "930s",
-    "931s-blue",
+    "931s-blue-plumage-Disabled",
-    "931s-blue",
+    "931s-blue-plumage-Disabled",
-    "931s-green",
+    "931s-green-plumage-Disabled",
-    "931s-green",
+    "931s-green-plumage-Disabled",
-    "931s-white",
+    "931s-white-plumage-Disabled",
-    "931s-white",
+    "931s-white-plumage-Disabled",
-    "931s-yellow",
+    "931s-yellow-plumage-Disabled",
-    "931s-yellow",
+    "931s-yellow-plumage-Disabled",
     "932s",
     "932s",
     "933s",
     "933s",
     "934s",
     "934s",
-    "935s",
+    "935s-Disabled",
-    "935s",
+    "935s-Disabled",
-    "936s",
+    "936s-Disabled",
-    "936s",
+    "936s-Disabled",
-    "937s",
+    "937s-Disabled",
-    "937s",
+    "937s-Disabled",
     "938s",
     "938s",
     "939s",
@@ -4438,6 +4440,8 @@
     "978s-droopy",
     "978s-stretchy",
     "978s-stretchy",
+    "979s-Disabled",
+    "979s-Disabled",
     "980s",
     "980s",
     "981s",
@@ -4485,11 +4489,10 @@
     "1000",
     "1001",
     "1004",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1007-apex",
+    "1007-apex-build-Disabled",
-    "1007-apex",
+    "1008-ultimate-mode-Disabled",
-    "1007-apex",
+    "1008-ultimate-mode-Disabled",
-    "1008-ultimate",
     "127-mega",
     "142-mega",
     "150-mega",
@@ -4596,8 +4599,6 @@
     "728",
     "729",
     "730",
-    "730_2",
-    "730_2",
     "747",
     "748",
     "753",
@@ -4698,21 +4699,21 @@
     "933_3",
     "933_3",
     "934",
-    "935",
+    "935-Disabled",
-    "935_3",
+    "935_3-Disabled",
-    "935_3",
+    "935_3-Disabled",
-    "936_1",
+    "936_1-Disabled",
-    "936_1",
+    "936_1-Disabled",
-    "936_2",
+    "936_2-Disabled",
-    "936_2",
+    "936_2-Disabled",
-    "936_3",
+    "936_3-Disabled",
-    "936_3",
+    "936_3-Disabled",
-    "937_1",
+    "937_1-Disabled",
-    "937_1",
+    "937_1-Disabled",
-    "937_2",
+    "937_2-Disabled",
-    "937_2",
+    "937_2-Disabled",
-    "937_3",
+    "937_3-Disabled",
-    "937_3",
+    "937_3-Disabled",
     "94-mega_1",
     "94-mega_1",
     "94-mega_2",
@@ -4755,11 +4756,10 @@
     "1000b",
     "1001b",
     "1004b",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1007b-apex",
+    "1007b-apex-build-Disabled",
-    "1007b-apex",
+    "1008b-ultimate-mode-Disabled",
-    "1007b-apex",
+    "1008b-ultimate-mode-Disabled",
-    "1008b-ultimate",
     "127b-mega",
     "142b-mega",
     "150b-mega",
@@ -4920,24 +4920,24 @@
     "932b",
     "933b",
     "934b",
-    "935_1b",
+    "935_1b-Disabled",
-    "935_1b",
+    "935_1b-Disabled",
-    "935_2b",
+    "935_2b-Disabled",
-    "935_2b",
+    "935_2b-Disabled",
-    "935_3b",
+    "935_3b-Disabled",
-    "935_3b",
+    "935_3b-Disabled",
-    "936_1b",
+    "936_1b-Disabled",
-    "936_1b",
+    "936_1b-Disabled",
-    "936_2b",
+    "936_2b-Disabled",
-    "936_2b",
+    "936_2b-Disabled",
-    "936_3b",
+    "936_3b-Disabled",
-    "936_3b",
+    "936_3b-Disabled",
-    "937_1b",
+    "937_1b-Disabled",
-    "937_1b",
+    "937_1b-Disabled",
-    "937_2b",
+    "937_2b-Disabled",
-    "937_2b",
+    "937_2b-Disabled",
-    "937_3b",
+    "937_3b-Disabled",
-    "937_3b",
+    "937_3b-Disabled",
     "94b-mega",
     "948b",
     "949b",