Merge branch 'pagefaultgames:beta' into hebrew-pr
2
.github/workflows/deploy-beta.yml
vendored
@ -11,7 +11,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
if: github.repository == 'pagefaultgames/pokerogue' && github.ref_name == ${{ vars.BETA_DEPLOY_BRANCH || 'beta' }}
|
if: github.repository == 'pagefaultgames/pokerogue' && github.ref_name == (vars.BETA_DEPLOY_BRANCH || 'beta')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
## Backgrounds
|
## Backgrounds
|
||||||
- Squip (Paid Commissions)
|
- Squip (Paid Commissions)
|
||||||
- Contributions by Someonealive-QN
|
- Contributions by Someonealive-QN
|
||||||
|
- Contributions by redactedinlight
|
||||||
|
|
||||||
## UI
|
## UI
|
||||||
- GAMEFREAK
|
- GAMEFREAK
|
||||||
|
@ -38,14 +38,13 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
// TODO: Configure and enable import sorting
|
|
||||||
"assist": {
|
"assist": {
|
||||||
"actions": {
|
"actions": {
|
||||||
"source": {
|
"source": {
|
||||||
"organizeImports": {
|
"organizeImports": {
|
||||||
"level": "off",
|
"level": "on",
|
||||||
"options": {
|
"options": {
|
||||||
"groups": []
|
"groups": [":ALIAS:", ":NODE:", ":PACKAGE_WITH_PROTOCOL:", ":PACKAGE:", ":PATH:"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -140,7 +139,7 @@
|
|||||||
"useAdjacentGetterSetter": "error",
|
"useAdjacentGetterSetter": "error",
|
||||||
"noConstantBinaryExpression": "error",
|
"noConstantBinaryExpression": "error",
|
||||||
"noTsIgnore": "error",
|
"noTsIgnore": "error",
|
||||||
"noAwaitInLoop": "warn",
|
"noAwaitInLoop": "off",
|
||||||
"useJsonImportAttribute": "off", // "Import attributes are only supported when the '--module' option is set to 'esnext', 'node18', 'nodenext', or 'preserve'. ts(2823)"
|
"useJsonImportAttribute": "off", // "Import attributes are only supported when the '--module' option is set to 'esnext', 'node18', 'nodenext', or 'preserve'. ts(2823)"
|
||||||
"useIndexOf": "error",
|
"useIndexOf": "error",
|
||||||
"useObjectSpread": "error",
|
"useObjectSpread": "error",
|
||||||
|
@ -15,4 +15,6 @@ post-merge:
|
|||||||
post-checkout:
|
post-checkout:
|
||||||
commands:
|
commands:
|
||||||
update-submodules:
|
update-submodules:
|
||||||
run: git submodule update --init --recursive
|
# cf https://git-scm.com/docs/githooks#_post_checkout:
|
||||||
|
# The 3rd argument is 1 for branch checkouts and 0 for file checkouts.
|
||||||
|
run: if test {3} -eq "1"; then git submodule update --init --recursive; fi
|
32
package.json
@ -29,34 +29,34 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.0.0",
|
"@biomejs/biome": "2.0.0",
|
||||||
"@types/jsdom": "^21.1.7",
|
"@types/jsdom": "^21.1.7",
|
||||||
"@types/node": "^22.13.14",
|
"@types/node": "^22.16.3",
|
||||||
"@vitest/coverage-istanbul": "^3.0.9",
|
"@vitest/coverage-istanbul": "^3.2.4",
|
||||||
"chalk": "^5.4.1",
|
"chalk": "^5.4.1",
|
||||||
"dependency-cruiser": "^16.3.10",
|
"dependency-cruiser": "^16.10.4",
|
||||||
"inquirer": "^12.4.2",
|
"inquirer": "^12.7.0",
|
||||||
"jsdom": "^26.0.0",
|
"jsdom": "^26.1.0",
|
||||||
"lefthook": "^1.11.5",
|
"lefthook": "^1.12.2",
|
||||||
"msw": "^2.7.3",
|
"msw": "^2.10.4",
|
||||||
"phaser3spectorjs": "^0.0.8",
|
"phaser3spectorjs": "^0.0.8",
|
||||||
"typedoc": "^0.28.1",
|
"typedoc": "^0.28.7",
|
||||||
"typescript": "^5.8.2",
|
"typescript": "^5.8.3",
|
||||||
"vite": "^6.3.4",
|
"vite": "^6.3.5",
|
||||||
"vite-tsconfig-paths": "^5.1.4",
|
"vite-tsconfig-paths": "^5.1.4",
|
||||||
"vitest": "^3.0.9",
|
"vitest": "^3.2.4",
|
||||||
"vitest-canvas-mock": "^0.3.3"
|
"vitest-canvas-mock": "^0.3.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@material/material-color-utilities": "^0.2.7",
|
"@material/material-color-utilities": "^0.2.7",
|
||||||
"compare-versions": "^6.1.1",
|
"compare-versions": "^6.1.1",
|
||||||
"crypto-js": "^4.2.0",
|
"crypto-js": "^4.2.0",
|
||||||
"i18next": "^24.2.2",
|
"i18next": "^24.2.3",
|
||||||
"i18next-browser-languagedetector": "^8.0.4",
|
"i18next-browser-languagedetector": "^8.2.0",
|
||||||
"i18next-http-backend": "^3.0.2",
|
"i18next-http-backend": "^3.0.2",
|
||||||
"i18next-korean-postposition-processor": "^1.0.0",
|
"i18next-korean-postposition-processor": "^1.0.0",
|
||||||
"json-stable-stringify": "^1.2.0",
|
"json-stable-stringify": "^1.3.0",
|
||||||
"jszip": "^3.10.1",
|
"jszip": "^3.10.1",
|
||||||
"phaser": "^3.88.2",
|
"phaser": "^3.90.0",
|
||||||
"phaser3-rex-plugins": "^1.80.15"
|
"phaser3-rex-plugins": "^1.80.16"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=22.0.0"
|
"node": ">=22.0.0"
|
||||||
|
1987
pnpm-lock.yaml
Before Width: | Height: | Size: 607 B After Width: | Height: | Size: 333 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 637 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 654 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 773 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 474 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 558 B |
Before Width: | Height: | Size: 772 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 552 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 667 B |
Before Width: | Height: | Size: 767 B After Width: | Height: | Size: 302 B |
Before Width: | Height: | Size: 764 B After Width: | Height: | Size: 318 B |
Before Width: | Height: | Size: 1008 B After Width: | Height: | Size: 384 B |
Before Width: | Height: | Size: 789 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 852 B After Width: | Height: | Size: 390 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 701 B |
Before Width: | Height: | Size: 779 B After Width: | Height: | Size: 340 B |
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 197 B |
Before Width: | Height: | Size: 694 B After Width: | Height: | Size: 285 B |
Before Width: | Height: | Size: 789 B After Width: | Height: | Size: 267 B |
Before Width: | Height: | Size: 943 B After Width: | Height: | Size: 420 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 635 B |
Before Width: | Height: | Size: 909 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 706 B After Width: | Height: | Size: 279 B |
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 309 B |
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 703 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 652 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 422 B |
Before Width: | Height: | Size: 868 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 788 B After Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 242 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 479 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 610 B |
Before Width: | Height: | Size: 617 B After Width: | Height: | Size: 252 B |
Before Width: | Height: | Size: 729 B After Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 260 B |
Before Width: | Height: | Size: 784 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 777 B After Width: | Height: | Size: 351 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 554 B |
Before Width: | Height: | Size: 785 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 670 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 470 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 858 B After Width: | Height: | Size: 422 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 755 B |
Before Width: | Height: | Size: 713 B After Width: | Height: | Size: 273 B |
Before Width: | Height: | Size: 596 B After Width: | Height: | Size: 239 B |
Before Width: | Height: | Size: 756 B After Width: | Height: | Size: 290 B |
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 576 B |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 960 B |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 733 B |
Before Width: | Height: | Size: 787 B After Width: | Height: | Size: 266 B |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 624 B |
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 781 B After Width: | Height: | Size: 265 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 497 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 967 B |
Before Width: | Height: | Size: 784 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 933 B After Width: | Height: | Size: 426 B |
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 784 B |
Before Width: | Height: | Size: 969 B After Width: | Height: | Size: 387 B |
Before Width: | Height: | Size: 908 B After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 768 B After Width: | Height: | Size: 299 B |
Before Width: | Height: | Size: 776 B After Width: | Height: | Size: 263 B |
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 398 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 504 B |
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 415 B |
Before Width: | Height: | Size: 522 B After Width: | Height: | Size: 218 B |
Before Width: | Height: | Size: 670 B After Width: | Height: | Size: 276 B |
Before Width: | Height: | Size: 788 B After Width: | Height: | Size: 264 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 458 B |
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 820 B |
Before Width: | Height: | Size: 910 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 493 B |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 341 B |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 603 B |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 931 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 457 B |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 467 B |
Before Width: | Height: | Size: 1022 B After Width: | Height: | Size: 432 B |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 349 B |
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 426 B |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 814 B |
Before Width: | Height: | Size: 931 B After Width: | Height: | Size: 396 B |
Before Width: | Height: | Size: 821 B After Width: | Height: | Size: 336 B |
Before Width: | Height: | Size: 752 B After Width: | Height: | Size: 324 B |