Merge branch 'beta' into damo-MysteryEncounterCollection

.github/workflows/github-pages.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - beta
   pull_request:
     branches:
       - main

.github/workflows/linting.yml

@@ -41,4 +41,7 @@ jobs:
         run: pnpm biome-ci
 
       - name: Check dependencies with depcruise
-        run: pnpm depcruise
+        run: pnpm depcruise
+      
+      - name: Lint with ls-lint
+        run: pnpm ls-lint

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

@@ -44,4 +44,4 @@ jobs:
         run: pnpm i
 
       - name: Run tests
-        run: pnpm exec vitest --project ${{ inputs.project }} --no-isolate --shard=${{ inputs.shard }}/${{ inputs.totalShards }} ${{ !runner.debug && '--silent' || '' }}
+        run: pnpm test:silent --shard=${{ inputs.shard }}/${{ inputs.totalShards }}

.github/workflows/tests.yml

@@ -11,6 +11,7 @@ on:
       - beta
   merge_group:
     types: [checks_requested]
+  workflow_dispatch:
 
 jobs:
   check-path-change-filter:

.ls-lint.yml

@@ -0,0 +1,28 @@
+# Base settings to use
+# Note that the `_cfg` key isn't part of ls-lint's configuration, it's just a YAML anchor for reuse.
+_cfg: &cfg
+   .ps1: kebab-case
+   .ts: kebab-case
+   .js: kebab-case
+   .*.ts: kebab-case
+   .*.js: kebab-case
+   .dir: kebab-case
+   .py: snake_case # python files should always use snake_case
+
+ls:
+   <<: *cfg
+   src: &src
+      <<: *cfg
+      .dir: kebab-case | regex:@types
+      .js: exists:0
+   src/system/version-migration/versions:
+      .ts: snake_case
+      <<: *cfg
+   test: *src
+ignore:
+   - node_modules
+   - .vscode
+   - .github
+   - .git
+   - public
+   - dist

CONTRIBUTING.md

@@ -104,7 +104,7 @@ Most non-trivial changes (*especially bug fixes*) should come along with new tes
     - Test edge cases. A good strategy is to think of edge cases beforehand and create tests for them using `it.todo`. Once the edge case has been handled, you can remove the `todo` marker.
 
 ## 😈 Development Save File
-> Some issues may require you to have unlocks on your save file which go beyond normal overrides. For this reason, the repository contains a [save file](../test/testUtils/saves/everything.psrv) with _everything_ unlocked (even ones not legitimately obtainable, like unimplemented variant shinies).
+> Some issues may require you to have unlocks on your save file which go beyond normal overrides. For this reason, the repository contains a [save file](../test/test-utils/saves/everything.psrv) with _everything_ unlocked (even ones not legitimately obtainable, like unimplemented variant shinies).
 
 1. Start the game up locally and navigate to `Menu -> Manage Data -> Import Data`
-2. Select [everything.prsv](test/testUtils/saves/everything.prsv) (`test/testUtils/saves/everything.prsv`) and confirm.
+2. Select [everything.prsv](test/test-utils/saves/everything.prsv) (`test/test-utils/saves/everything.prsv`) and confirm.

biome.jsonc

@@ -177,9 +177,10 @@
       }
     },
 
-    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes)
+    // Overrides to prevent unused import removal inside `overrides.ts` and enums files (for TSDoc linkcodes),
+    // as well as in all TS files in `scripts/` (which are assumed to be boilerplate templates).
     {
-      "includes": ["**/src/overrides.ts", "**/src/enums/**/*"],
+      "includes": ["**/src/overrides.ts", "**/src/enums/**/*", "**/scripts/**/*.ts"],
       "linter": {
         "rules": {
           "correctness": {
@@ -189,7 +190,7 @@
       }
     },
     {
-      "includes": ["**/src/overrides.ts"],
+      "includes": ["**/src/overrides.ts", "**/scripts/**/*.ts"],
       "linter": {
         "rules": {
           "style": {

global.d.ts

@@ -8,7 +8,7 @@ declare global {
    * Can technically be undefined/null but for ease of use we are going to assume it is always defined.
    * Used to load i18n files exclusively.
    *
-   * To set up your own server in a test see `game_data.test.ts`
+   * To set up your own server in a test see `game-data.test.ts`
    */
   var server: SetupServerApi;
 }

lefthook.yml

@@ -1,11 +1,13 @@
 pre-commit:
+  skip: 
+    - merge
+    - rebase
   commands:
     biome-lint:
       run: pnpm exec biome check --write --reporter=summary --staged --no-errors-on-unmatched
       stage_fixed: true
-      skip:
+    ls-lint:
-        - merge
+      run: pnpm exec ls-lint
-        - rebase
 
 post-merge:
   commands:

package.json

@@ -12,7 +12,7 @@
     "test": "vitest run --no-isolate",
     "test:cov": "vitest run --coverage --no-isolate",
     "test:watch": "vitest watch --coverage --no-isolate",
-    "test:silent": "vitest run --silent --no-isolate",
+    "test:silent": "vitest run --silent='passed-only' --no-isolate",
     "test:create": "node scripts/create-test/create-test.js",
     "typecheck": "tsc --noEmit",
     "eslint": "eslint --fix .",
@@ -28,9 +28,11 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.0.0",
+    "@ls-lint/ls-lint": "2.3.1",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.16.3",
     "@vitest/coverage-istanbul": "^3.2.4",
+    "@vitest/expect": "^3.2.4",
     "chalk": "^5.4.1",
     "dependency-cruiser": "^16.10.4",
     "inquirer": "^12.7.0",

pnpm-lock.yaml

@@ -45,6 +45,9 @@ importers:
       '@biomejs/biome':
         specifier: 2.0.0
         version: 2.0.0
+      '@ls-lint/ls-lint':
+        specifier: 2.3.1
+        version: 2.3.1
       '@types/jsdom':
         specifier: ^21.1.7
         version: 21.1.7
@@ -54,6 +57,9 @@ importers:
       '@vitest/coverage-istanbul':
         specifier: ^3.2.4
         version: 3.2.4(vitest@3.2.4(@types/node@22.16.3)(jsdom@26.1.0)(msw@2.10.4(@types/node@22.16.3)(typescript@5.8.3))(yaml@2.8.0))
+      '@vitest/expect':
+        specifier: ^3.2.4
+        version: 3.2.4
       chalk:
         specifier: ^5.4.1
         version: 5.4.1
@@ -565,6 +571,12 @@ packages:
   '@jridgewell/trace-mapping@0.3.29':
     resolution: {integrity: sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==}
 
+  '@ls-lint/ls-lint@2.3.1':
+    resolution: {integrity: sha512-vPe6IDByQnQRTxcAYjTxrmga/tSIui50VBFTB5KIJWY3OOFmxE2VtymjeSEfQfiMbhZV/ZPAqYy2lt8pZFQ0Rw==}
+    cpu: [x64, arm64, s390x, ppc64le]
+    os: [darwin, linux, win32]
+    hasBin: true
+
   '@material/material-color-utilities@0.2.7':
     resolution: {integrity: sha512-0FCeqG6WvK4/Cc06F/xXMd/pv4FeisI0c1tUpBbfhA2n9Y8eZEv4Karjbmf2ZqQCPUWMrGp8A571tCjizxoTiQ==}
 
@@ -2452,6 +2464,8 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.4
 
+  '@ls-lint/ls-lint@2.3.1': {}
+
   '@material/material-color-utilities@0.2.7': {}
 
   '@mswjs/interceptors@0.39.2':