Skip to content

Commit b9a524c

Browse files
authored
chore!: Hotfix 1.11.12 to Main
2 parents e6b290d + ad111cf commit b9a524c

File tree

557 files changed

+1683
-1549
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

557 files changed

+1683
-1549
lines changed

.github/workflows/github-pages.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ jobs:
3636
with:
3737
sparse-checkout: |
3838
.nvmrc
39-
sparse-checkout-cone-mode: false
4039
4140
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
4241
id: filter
4342
with:
4443
filters: |
4544
all:
4645
- "src/**/*.ts"
47-
- "test/test-utils/*.ts"
46+
- "test/utils/*.ts"
4847
- "typedoc.config.js"
4948
- "tsdoc.json"
5049
- "tsconfig.json"

.github/workflows/linting.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
with:
4040
sparse-checkout: |
4141
.nvmrc
42-
sparse-checkout-cone-mode: false
4342
4443
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
4544
id: filter

.github/workflows/tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
with:
4040
sparse-checkout: |
4141
.github/test-filters.yml
42-
sparse-checkout-cone-mode: false
4342
4443
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
4544
id: filter
@@ -82,7 +81,7 @@ jobs:
8281
sparse-checkout: |
8382
.github/actions/setup-deps/action.yml
8483
test/setup
85-
test/test-utils/reporters/custom-default-reporter.ts
84+
test/reporters/custom-default-reporter.ts
8685
8786
- uses: ./.github/actions/setup-deps
8887

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ Ensure that new test cases:
147147

148148
<!-- TODO: Decide on and suggest a specific placement heiarchy for test cases involving interactions between different moves/abilities/etc. -->
149149

150+
> [!NOTE]
151+
> While Vitest does support both Jest and Chai syntax for assertions, our project exclusively uses Jest-style assertions (`...toBe()`, `...toEqual()`, etc.) for internal consistency. (The Chai variants have been blacklisted via TypeScript declaration merging, ensuring they aren't accidentally used by mistake.)
152+
150153
#### Running tests
151154
To make sure your changes didn't break any existing test cases, run `pnpm test:silent` in your terminal to run the full test suite. \
152155
You can provide additional arguments to the command to change its behavior or specify which test files to run;
@@ -158,10 +161,10 @@ a full list of supported arguments can be found on [Vitest's website](https://vi
158161
159162
## 💾 Development Save File
160163
> Some issues may require you to have unlocks on your save file which go beyond normal overrides.
161-
> For this reason, the repository contains a [save file](test/test-utils/saves/everything.psrv) with _everything_ unlocked (it may also contain things that are not legitimately obtainable).
164+
> For this reason, the repository contains a [save file](test/utils/saves/everything.psrv) with _everything_ unlocked (it may also contain things that are not legitimately obtainable).
162165
163166
1. Start the game up locally and navigate to `Menu -> Manage Data -> Import Data`
164-
2. Select [everything.prsv](test/test-utils/saves/everything.prsv) (`test/test-utils/saves/everything.prsv`) and confirm.
167+
2. Select [everything.prsv](test/utils/saves/everything.prsv) (`test/utils/saves/everything.prsv`) and confirm.
165168

166169
## ✅ Submitting a Pull Request
167170

assets

Submodule assets updated 72 files

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pokemon-rogue-battle",
33
"private": true,
4-
"version": "1.11.11",
4+
"version": "1.11.12",
55
"type": "module",
66
"scripts": {
77
"start:prod": "vite --mode production",
@@ -43,7 +43,7 @@
4343
},
4444
"dependencies": {
4545
"@material/material-color-utilities": "^0.3.0",
46-
"ajv": "^8.17.1",
46+
"ajv": "^8.18.0",
4747
"compare-versions": "^6.1.1",
4848
"core-js": "^3.47.0",
4949
"crypto-js": "^4.2.0",

pnpm-lock.yaml

Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ onlyBuiltDependencies:
77
- msw
88

99
overrides:
10+
ajv@>=7.0.0-alpha.0 <8.18.0: '>=8.18.0'
1011
markdown-it@>=13.0.0 <14.1.1: '>=14.1.1'
12+
minimatch@<10.2.1: '>=10.2.1'
1113
undici@<6.23.0: '>=6.23.0'
1214

1315
shellEmulator: true

scripts/create-test/boilerplates/default.boilerplate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { BattlerIndex } from "#enums/battler-index";
99
import { MoveId } from "#enums/move-id";
1010
import { MoveResult } from "#enums/move-result";
1111
import { SpeciesId } from "#enums/species-id";
12-
import { GameManager } from "#test/test-utils/game-manager";
12+
import { GameManager } from "#test/framework/game-manager";
1313
import i18next from "i18next";
1414
import Phaser from "phaser";
1515
import { beforeAll, beforeEach, describe, expect, it } from "vitest";
@@ -37,7 +37,7 @@ describe("{{description}}", () => {
3737
.enemyLevel(100);
3838
});
3939

40-
// Find more awesome utility functions inside `#test/test-utils`!
40+
// Find more awesome utility functions inside `#test/utils`!
4141
it("should do XYZ", async () => {
4242
await game.classicMode.startBattle(SpeciesId.FEEBAS);
4343

0 commit comments

Comments
 (0)