Merge remote-tracking branch 'upstream/beta' into future-sight

CREDITS.md

@@ -40,6 +40,7 @@
 ## Backgrounds
 - Squip (Paid Commissions)
 - Contributions by Someonealive-QN
+- Contributions by redactedinlight
 
 ## UI
 - GAMEFREAK

lefthook.yml

@@ -15,4 +15,6 @@ post-merge:
 post-checkout:
   commands:
     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

src/field/arena.ts

@@ -935,6 +935,7 @@ export function getBiomeKey(biome: BiomeId): string {
 
 export function getBiomeHasProps(biomeType: BiomeId): boolean {
   switch (biomeType) {
+    case BiomeId.PLAINS:
     case BiomeId.METROPOLIS:
     case BiomeId.BEACH:
     case BiomeId.LAKE:

src/main.ts

@@ -1,3 +1,6 @@
+import "#app/polyfills";
+// All polyfills MUST be loaded first for side effects
+
 import { InvertPostFX } from "#app/pipelines/invert";
 import { initI18n } from "#app/plugins/i18n";
 import { version } from "#package.json";

src/polyfills.ts

@@ -0,0 +1,21 @@
+/*
+Manual rolling of polyfills desired by the project.
+
+IMPORTANT: When adding / removing polyfills, ensure that typescript becomes
+aware of their existence, either by creating `src/typings/polyfills.d.ts`
+and defining them there, or or by adding the appropriate field polyfill to the
+`lib` property in `tsconfig.json`.
+*/
+
+if (typeof Promise.withResolvers === "undefined") {
+  Promise.withResolvers = <T>() => {
+    // Bangs are OK here; they are guaranteed to be defined when the promise is invoked.
+    let resolve!: (value: T | PromiseLike<T>) => void;
+    let reject!: (reason?: unknown) => void;
+    const promise = new Promise<T>((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return { promise, resolve, reject };
+  };
+}

tsconfig.json

@@ -2,6 +2,17 @@
   "compilerOptions": {
     "target": "ES2020",
     "module": "ES2020",
+    // Modifying this option requires all values to be set manually because the defaults get overridden
+    // Values other than "ES2024.Promise" taken from https://github.com/microsoft/TypeScript/blob/main/src/lib/es2020.full.d.ts
+    "lib": [
+      "ES2020",
+      "ES2024.Promise",
+      "DOM",
+      "DOM.AsyncIterable",
+      "DOM.Iterable",
+      "ScriptHost",
+      "WebWorker.ImportScripts"
+    ],
     "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "esModuleInterop": true,