From 010ff29b16579e0d94f2198f377758d8d12d13e8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 31 May 2024 20:20:33 +0530
Subject: [PATCH 01/42] Shorten equiv

---
 desktop/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/tsconfig.json b/desktop/tsconfig.json
index 7806cd93a7..cf0f8b8856 100644
--- a/desktop/tsconfig.json
+++ b/desktop/tsconfig.json
@@ -32,6 +32,6 @@
         "noUncheckedIndexedAccess": true,
         "exactOptionalPropertyTypes": true
     },
-    /* Transpile all `.ts` files in `src/` */
-    "include": ["src/**/*.ts"]
+    /* Include all `.ts` files in `src/` */
+    "include": ["src"]
 }

From 8b35cfd802750d0b554ec1f8a4b630acdb85f8e7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Fri, 31 May 2024 20:28:23 +0530
Subject: [PATCH 02/42] Update @typescript-eslint/*

---
 desktop/yarn.lock | 149 +++++++++++++++++++++++-----------------------
 1 file changed, 74 insertions(+), 75 deletions(-)

diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 0ad96e95d8..c1e1cf5c4a 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -298,11 +298,6 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
   integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
 
-"@types/json-schema@^7.0.15":
-  version "7.0.15"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
-  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
-
 "@types/keyv@^3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
@@ -342,11 +337,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/semver@^7.5.8":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
 "@types/verror@^1.10.3":
   version "1.10.10"
   resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.10.tgz#d5a4b56abac169bfbc8b23d291363a682e6fa087"
@@ -360,63 +350,61 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^7":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz#c78e309fe967cb4de05b85cdc876fb95f8e01b6f"
-  integrity sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz#f90f0914657ead08e1c75f66939c926edeab42dd"
+  integrity sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.8.0"
-    "@typescript-eslint/type-utils" "7.8.0"
-    "@typescript-eslint/utils" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
-    debug "^4.3.4"
+    "@typescript-eslint/scope-manager" "7.11.0"
+    "@typescript-eslint/type-utils" "7.11.0"
+    "@typescript-eslint/utils" "7.11.0"
+    "@typescript-eslint/visitor-keys" "7.11.0"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
-    semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
 "@typescript-eslint/parser@^7":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.8.0.tgz#1e1db30c8ab832caffee5f37e677dbcb9357ddc8"
-  integrity sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.11.0.tgz#525ad8bee54a8f015f134edd241d91b84ab64839"
+  integrity sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.8.0"
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/typescript-estree" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/scope-manager" "7.11.0"
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/typescript-estree" "7.11.0"
+    "@typescript-eslint/visitor-keys" "7.11.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz#bb19096d11ec6b87fb6640d921df19b813e02047"
-  integrity sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==
+"@typescript-eslint/scope-manager@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz#cf5619b01de62a226a59add15a02bde457335d1d"
+  integrity sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==
   dependencies:
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/visitor-keys" "7.11.0"
 
-"@typescript-eslint/type-utils@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz#9de166f182a6e4d1c5da76e94880e91831e3e26f"
-  integrity sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==
+"@typescript-eslint/type-utils@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz#ac216697d649084fedf4a910347b9642bd0ff099"
+  integrity sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.8.0"
-    "@typescript-eslint/utils" "7.8.0"
+    "@typescript-eslint/typescript-estree" "7.11.0"
+    "@typescript-eslint/utils" "7.11.0"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.8.0.tgz#1fd2577b3ad883b769546e2d1ef379f929a7091d"
-  integrity sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==
+"@typescript-eslint/types@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.11.0.tgz#5e9702a5e8b424b7fc690e338d359939257d6722"
+  integrity sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==
 
-"@typescript-eslint/typescript-estree@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz#b028a9226860b66e623c1ee55cc2464b95d2987c"
-  integrity sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==
+"@typescript-eslint/typescript-estree@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz#7cbc569bc7336c3a494ceaf8204fdee5d5dbb7fa"
+  integrity sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==
   dependencies:
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/visitor-keys" "7.8.0"
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/visitor-keys" "7.11.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -424,25 +412,22 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.8.0.tgz#57a79f9c0c0740ead2f622e444cfaeeb9fd047cd"
-  integrity sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==
+"@typescript-eslint/utils@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.11.0.tgz#524f047f2209959424c3ef689b0d83b3bc09919c"
+  integrity sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.15"
-    "@types/semver" "^7.5.8"
-    "@typescript-eslint/scope-manager" "7.8.0"
-    "@typescript-eslint/types" "7.8.0"
-    "@typescript-eslint/typescript-estree" "7.8.0"
-    semver "^7.6.0"
+    "@typescript-eslint/scope-manager" "7.11.0"
+    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/typescript-estree" "7.11.0"
 
-"@typescript-eslint/visitor-keys@7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz#7285aab991da8bee411a42edbd5db760d22fdd91"
-  integrity sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==
+"@typescript-eslint/visitor-keys@7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz#2c50cd292e67645eec05ac0830757071b4a4d597"
+  integrity sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==
   dependencies:
-    "@typescript-eslint/types" "7.8.0"
+    "@typescript-eslint/types" "7.11.0"
     eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
@@ -718,7 +703,14 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
+  dependencies:
+    fill-range "^7.1.1"
+
+braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -1055,13 +1047,20 @@ debounce-fn@^4.0.0:
   dependencies:
     mimic-fn "^3.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.4:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  dependencies:
+    ms "2.1.2"
+
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -1505,10 +1504,10 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.0.1, fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -2255,11 +2254,11 @@ merge2@^1.3.0, merge2@^1.4.1:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.52.0:
@@ -2924,12 +2923,12 @@ semver@^6.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2:
+semver@^7.3.2, semver@^7.6.0:
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
   integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
-semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0:
+semver@^7.3.5, semver@^7.3.8, semver@^7.5.3:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==

From 1f33df7147fb4a43bddca93872b1015c022f6ba8 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Sat, 1 Jun 2024 11:31:31 +0530
Subject: [PATCH 03/42] [auth] Surface more information about importError on UI

---
 auth/lib/ui/settings/data/import/aegis_import.dart         | 4 ++--
 auth/lib/ui/settings/data/import/bitwarden_import.dart     | 7 ++++---
 auth/lib/ui/settings/data/import/lastpass_import.dart      | 6 ++++--
 .../ui/settings/data/import/raivo_plain_text_import.dart   | 6 ++++--
 auth/lib/ui/settings/data/import/two_fas_import.dart       | 2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/auth/lib/ui/settings/data/import/aegis_import.dart b/auth/lib/ui/settings/data/import/aegis_import.dart
index f6dd872522..bc9a509108 100644
--- a/auth/lib/ui/settings/data/import/aegis_import.dart
+++ b/auth/lib/ui/settings/data/import/aegis_import.dart
@@ -76,7 +76,7 @@ Future<void> _pickAegisJsonFile(BuildContext context) async {
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
@@ -148,7 +148,7 @@ Future<int?> _processAegisExportFile(
       otpUrl =
           'otpauth://$kind/$issuer:$account?secret=$secret&issuer=$issuer&algorithm=$algorithm&digits=$digits&counter=$counter';
     } else {
-      throw Exception('Invalid OTP type');
+      throw Exception('Invalid OTP type: $kind');
     }
     parsedCodes.add(Code.fromOTPAuthUrl(otpUrl));
   }
diff --git a/auth/lib/ui/settings/data/import/bitwarden_import.dart b/auth/lib/ui/settings/data/import/bitwarden_import.dart
index 6878fa9f05..fcc71521bf 100644
--- a/auth/lib/ui/settings/data/import/bitwarden_import.dart
+++ b/auth/lib/ui/settings/data/import/bitwarden_import.dart
@@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 Future<void> showBitwardenImportInstruction(BuildContext context) async {
   final l10n = context.l10n;
@@ -60,12 +61,13 @@ Future<void> _pickBitwardenJsonFile(BuildContext context) async {
     if (count != null) {
       await importSuccessDialog(context, count);
     }
-  } catch (e) {
+  } catch (e,s) {
+    Logger("BitwardenImport").severe('Failed to import',e,s);
     await progressDialog.hide();
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
@@ -90,7 +92,6 @@ Future<int?> _processBitwardenExportFile(
       } else {
         var issuer = item['name'];
         var account = item['login']['username'];
-
         code = Code.fromAccountAndSecret(
           Type.totp,
           account,
diff --git a/auth/lib/ui/settings/data/import/lastpass_import.dart b/auth/lib/ui/settings/data/import/lastpass_import.dart
index 8c36f02536..550f2af7e0 100644
--- a/auth/lib/ui/settings/data/import/lastpass_import.dart
+++ b/auth/lib/ui/settings/data/import/lastpass_import.dart
@@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 Future<void> showLastpassImportInstruction(BuildContext context) async {
   final l10n = context.l10n;
@@ -60,12 +61,13 @@ Future<void> _pickLastpassJsonFile(BuildContext context) async {
     if (count != null) {
       await importSuccessDialog(context, count);
     }
-  } catch (e) {
+  } catch (e, s) {
+    Logger('LastPassImport').severe('exception while processing import', e, s);
     await progressDialog.hide();
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
diff --git a/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart b/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
index 3590a38b37..5adaa73cf5 100644
--- a/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
+++ b/auth/lib/ui/settings/data/import/raivo_plain_text_import.dart
@@ -14,6 +14,7 @@ import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
 
 Future<void> showRaivoImportInstruction(BuildContext context) async {
   final l10n = context.l10n;
@@ -60,12 +61,13 @@ Future<void> _pickRaivoJsonFile(BuildContext context) async {
     if (count != null) {
       await importSuccessDialog(context, count);
     }
-  } catch (e) {
+  } catch (e, s) {
+    Logger("RaivoImport").severe('Failed to import', e, s);
     await progressDialog.hide();
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }
diff --git a/auth/lib/ui/settings/data/import/two_fas_import.dart b/auth/lib/ui/settings/data/import/two_fas_import.dart
index 710d898d44..db33a10f35 100644
--- a/auth/lib/ui/settings/data/import/two_fas_import.dart
+++ b/auth/lib/ui/settings/data/import/two_fas_import.dart
@@ -72,7 +72,7 @@ Future<void> _pick2FasFile(BuildContext context) async {
     await showErrorDialog(
       context,
       context.l10n.sorry,
-      context.l10n.importFailureDesc,
+      "${context.l10n.importFailureDesc}\n Error: ${e.toString()}",
     );
   }
 }

From ebc3f53fe3288cd48b7ce21ee61f7c589909082f Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Sat, 1 Jun 2024 11:32:51 +0530
Subject: [PATCH 04/42] Auth Bump version: 3.0.5+305

---
 auth/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth/pubspec.yaml b/auth/pubspec.yaml
index 3a127cee31..496623b869 100644
--- a/auth/pubspec.yaml
+++ b/auth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: ente_auth
 description: ente two-factor authenticator
-version: 3.0.4+304
+version: 3.0.5+305
 publish_to: none
 
 environment:

From 87f53177c09d72b02caa618fb68f42902aee5f8d Mon Sep 17 00:00:00 2001
From: Vishnu Mohandas <vishnu@ente.io>
Date: Sat, 1 Jun 2024 15:27:23 +0530
Subject: [PATCH 05/42] Update index.md

---
 docs/docs/auth/migration-guides/steam/index.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/docs/auth/migration-guides/steam/index.md b/docs/docs/auth/migration-guides/steam/index.md
index acb1f77aa5..1784c61a2b 100644
--- a/docs/docs/auth/migration-guides/steam/index.md
+++ b/docs/docs/auth/migration-guides/steam/index.md
@@ -5,8 +5,6 @@ description: Guide for importing from Steam Authenticator to Ente Auth
 
 # Migrating from Steam Authenticator
 
-A guide written by an ente.io lover
-
 > [!WARNING]
 >
 > Steam Authenticator code is only supported after auth-v3.0.3, check the app's

From b8911d83037f3933e7d7b986046b44c844d21330 Mon Sep 17 00:00:00 2001
From: Vishnu Mohandas <vishnu@ente.io>
Date: Sat, 1 Jun 2024 18:07:55 +0530
Subject: [PATCH 06/42] Format doc

---
 docs/docs/self-hosting/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/self-hosting/index.md b/docs/docs/self-hosting/index.md
index 14f9ba4dd7..03e31226dd 100644
--- a/docs/docs/self-hosting/index.md
+++ b/docs/docs/self-hosting/index.md
@@ -41,7 +41,7 @@ NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 yarn dev
 That's about it. If you open http://localhost:3000, you will be able to create
 an account on a Ente Photos web app running on your machine, and this web app
 will be connecting to the server running on your local machine at
-localhost:8080.
+`localhost:8080`.
 
 For the mobile apps, you don't even need to build, and can install normal Ente
 apps and configure them to use your

From cab86604461bca61d6a04f83e5f8f5edcbf28f9d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sat, 1 Jun 2024 20:04:28 +0530
Subject: [PATCH 07/42] [desktop] (Maybe) fix the dock icon on Linux

Ref: https://github.com/ente-io/ente/issues/1909

build/icons/512-512.png is just a 1/2 copy of build/icons.png.
---
 desktop/build/icons/512-512.png | Bin 0 -> 18922 bytes
 desktop/src/main.ts             |  49 ++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 desktop/build/icons/512-512.png

diff --git a/desktop/build/icons/512-512.png b/desktop/build/icons/512-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d4d8ced53dd2b9a3946a0498046ff23810e9a20
GIT binary patch
literal 18922
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

literal 0
HcmV?d00001

diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index a5abc26271..8a43b01a30 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -154,6 +154,8 @@ const createMainWindow = () => {
         backgroundColor: "black",
         // We'll show it conditionally depending on `wasAutoLaunched` later.
         show: false,
+        // (Maybe) fix the dock icon on Linux.
+        ...windowIconOptions(),
     });
 
     const wasAutoLaunched = autoLauncher.wasAutoLaunched();
@@ -313,6 +315,53 @@ const setupTrayItem = (mainWindow: BrowserWindow) => {
     tray.setContextMenu(createTrayContextMenu(mainWindow));
 };
 
+/**
+ * On Linux the app does not show a dock icon by default, attempt to fix this by
+ * returning the path to an icon as the "icon" property that can be passed to
+ * the BrowserWindow during creation.
+ */
+const windowIconOptions = () => {
+    if (process.platform != "linux") return {};
+
+    // There are two, possibly three, different issues with icons on Linux.
+    //
+    // Firstly, the AppImage itself doesn't show an icon. There does not seem to
+    // be a reasonable workaround either currently. See:
+    // https://github.com/AppImage/AppImageKit/issues/346
+    //
+    // Secondly, and this is the problem we're trying to fix here, when the app
+    // is started it does not show a dock icon (Ubuntu 22) or shows the generic
+    // gear icon (Ubuntu 24). The issue possibly exists on other distributions
+    // too.
+    //
+    // Electron provides a `BrowserWindow.setIcon` function which should solve
+    // our issue, we could call it selectively on Linux. There is also an
+    // apparently undocumented "icon" option that can be passed when creating a
+    // new BrowserWindow, and that is what most of the other code I saw on
+    // GitHub seems to be doing.
+    //
+    // However, try what I may, I can't get either of these to work. Which leads
+    // me to believe there is a third issue: I can't get it to work because I'm
+    // testing on an Ubuntu 24 VM, where this might just not be working:
+    // https://askubuntu.com/questions/1511534/ubuntu-24-04-skype-logo-on-the-dock-not-showing-skype-logo
+    //
+    // 24 isn't likely the year of the Linux desktop either.
+    //
+    // For now, I'm adding a very specific incantation taken from
+    // https://github.com/arduino/arduino-ide/blob/main/arduino-ide-extension/src/electron-main/fix-app-image-icon.ts
+    //
+    // Possibly all this specific naming of the file etc is superstition, and
+    // just any name would do as long as the path is correct, but let me try it
+    // this way and see if this gets the icon to appear on Ubuntu 22 etc.
+
+    const icon = path.join(
+        isDev ? "build" : process.resourcesPath,
+        "icons/512x512.png",
+    );
+
+    return { icon };
+};
+
 /**
  * Older versions of our app used to maintain a cache dir using the main
  * process. This has been removed in favor of cache on the web layer. Delete the

From b6cb264cbb70063b6d0f485cb8b4e018c5f6a63b Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Sat, 1 Jun 2024 21:32:04 +0530
Subject: [PATCH 08/42] [mob][photos] Bump

---
 mobile/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index 0f11275f1a..1f37164680 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.8.128+648
+version: 0.8.129+649
 publish_to: none
 
 environment:

From 3ff5b2f18f33bb963eb500e44024482355835cb7 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 12:29:38 +0530
Subject: [PATCH 09/42] This config is automatically included

...if you use any of the recommended configurations.

https://typescript-eslint.io/users/configs/
---
 desktop/.eslintrc.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/desktop/.eslintrc.js b/desktop/.eslintrc.js
index 44d03ef0c1..5fe9f27d86 100644
--- a/desktop/.eslintrc.js
+++ b/desktop/.eslintrc.js
@@ -3,7 +3,6 @@ module.exports = {
     root: true,
     extends: [
         "eslint:recommended",
-        "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/strict-type-checked",
         "plugin:@typescript-eslint/stylistic-type-checked",
     ],

From 781a99aa423c497c8003f8fee79148db225ea0a1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 12:37:10 +0530
Subject: [PATCH 10/42] Place

---
 web/apps/photos/package.json     |  1 +
 web/packages/new/.eslintrc.js    |  3 +++
 web/packages/new/README.md       | 11 +++++++++++
 web/packages/new/package.json    |  7 +++++++
 web/packages/new/photos/hello.ts |  2 ++
 web/packages/new/tsconfig.json   |  4 ++++
 6 files changed, 28 insertions(+)
 create mode 100644 web/packages/new/.eslintrc.js
 create mode 100644 web/packages/new/README.md
 create mode 100644 web/packages/new/package.json
 create mode 100644 web/packages/new/photos/hello.ts
 create mode 100644 web/packages/new/tsconfig.json

diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json
index 001fc1036a..9c07cc7aa6 100644
--- a/web/apps/photos/package.json
+++ b/web/apps/photos/package.json
@@ -4,6 +4,7 @@
     "private": true,
     "dependencies": {
         "@/media": "*",
+        "@/new": "*",
         "@/next": "*",
         "@date-io/date-fns": "^2.14.0",
         "@ente/accounts": "*",
diff --git a/web/packages/new/.eslintrc.js b/web/packages/new/.eslintrc.js
new file mode 100644
index 0000000000..4123f0cae3
--- /dev/null
+++ b/web/packages/new/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+    extends: ["@/build-config/eslintrc-base"],
+};
diff --git a/web/packages/new/README.md b/web/packages/new/README.md
new file mode 100644
index 0000000000..ee7dd46007
--- /dev/null
+++ b/web/packages/new/README.md
@@ -0,0 +1,11 @@
+## @/new
+
+This package only exists so that we can write code that works with TypeScript
+strict mode. This provides a gradual way of migrating the existing code in the
+old packages to strict mode. Once there is sufficient gravity here, we can flip
+the switch on the original packages and move these back to where they came from.
+
+### Packaging
+
+This (internal) package exports a vanilla TypeScript library. We rely on the
+importing project to transpile and bundle it.
diff --git a/web/packages/new/package.json b/web/packages/new/package.json
new file mode 100644
index 0000000000..dcfbf6cfc1
--- /dev/null
+++ b/web/packages/new/package.json
@@ -0,0 +1,7 @@
+{
+    "name": "@/new",
+    "version": "0.0.0",
+    "private": true,
+    "dependencies": {},
+    "devDependencies": {}
+}
diff --git a/web/packages/new/photos/hello.ts b/web/packages/new/photos/hello.ts
new file mode 100644
index 0000000000..7a6cfff7a6
--- /dev/null
+++ b/web/packages/new/photos/hello.ts
@@ -0,0 +1,2 @@
+/** Dummy function to get the package to behave. */
+export const hello = (ms: number) => ms;
diff --git a/web/packages/new/tsconfig.json b/web/packages/new/tsconfig.json
new file mode 100644
index 0000000000..d890ecabeb
--- /dev/null
+++ b/web/packages/new/tsconfig.json
@@ -0,0 +1,4 @@
+{
+    "extends": "@/build-config/tsconfig-typecheck.json",
+    "include": ["."]
+}

From 23107588105514ceaaf0e5d5873ebfa660dc3a03 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 12:43:31 +0530
Subject: [PATCH 11/42] We'll put react code here

---
 web/packages/new/.eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/new/.eslintrc.js b/web/packages/new/.eslintrc.js
index 4123f0cae3..53a0075961 100644
--- a/web/packages/new/.eslintrc.js
+++ b/web/packages/new/.eslintrc.js
@@ -1,3 +1,3 @@
 module.exports = {
-    extends: ["@/build-config/eslintrc-base"],
+    extends: ["@/build-config/eslintrc-react"],
 };

From 39a17bc0b80a3f11a9670363933fbdd9eceaf5b8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 12:45:59 +0530
Subject: [PATCH 12/42] eslint 9

---
 desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/package.json b/desktop/package.json
index 4e493e30c8..cea2a7c4a1 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -47,7 +47,7 @@
         "concurrently": "^8",
         "electron": "^30",
         "electron-builder": "25.0.0-alpha.6",
-        "eslint": "^8",
+        "eslint": "^9",
         "prettier": "^3",
         "prettier-plugin-organize-imports": "^3",
         "prettier-plugin-packagejson": "^2",

From 429caf5f6c392dab39553c4d2feec4603ba3370f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 12:56:54 +0530
Subject: [PATCH 13/42] New

---
 web/docs/dependencies.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/docs/dependencies.md b/web/docs/dependencies.md
index 6f959e61f5..58860f8fac 100644
--- a/web/docs/dependencies.md
+++ b/web/docs/dependencies.md
@@ -14,11 +14,15 @@ baseline for how our code be in all the workspaces in this (yarn) monorepo.
 They also need some support packages, which come from the leaf `@/build-config`
 package:
 
--   [@typescript-eslint/parser](https://typescript-eslint.io/packages/eslint-plugin/)
-    \- Tells ESLint how to read TypeScript syntax.
-
--   [@typescript-eslint/eslint-plugin](https://typescript-eslint.io/packages/eslint-plugin/)
-    \- Provides TypeScript rules and presets
+-   [typescript-eslint](https://typescript-eslint.io/packages/typescript-eslint/)
+    \- Teaches ESLint how to read TypeScript syntax, provides TypeScript
+    specific ESLint rules, and set of default preset rulesets
+    (`typescript-eslint` is the new entry point, our yet-unmigrated packages use
+    the older method of separately including
+    [@typescript-eslint/parser](https://typescript-eslint.io/packages/eslint-plugin/)
+    \- which tells ESLint how to read TypeScript syntax - and
+    [@typescript-eslint/eslint-plugin](https://typescript-eslint.io/packages/eslint-plugin/)
+    \- which provides the TypeScript rules and presets).
 
 -   [eslint-plugin-react-hooks](https://github.com/jsx-eslint/eslint-plugin-react),
     [eslint-plugin-react-hooks](https://reactjs.org/) \- Some React specific

From d9477891bb1fd8aca858a7cc4152bb25b49e7c41 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 13:22:46 +0530
Subject: [PATCH 14/42] eslint 9

---
 desktop/.eslintrc.js      |  35 -------
 desktop/eslint.config.mjs |  43 +++++++++
 desktop/package.json      |   9 +-
 desktop/yarn.lock         | 196 +++++++++++++++++++++-----------------
 web/docs/dependencies.md  |  10 +-
 5 files changed, 162 insertions(+), 131 deletions(-)
 delete mode 100644 desktop/.eslintrc.js
 create mode 100644 desktop/eslint.config.mjs

diff --git a/desktop/.eslintrc.js b/desktop/.eslintrc.js
deleted file mode 100644
index 5fe9f27d86..0000000000
--- a/desktop/.eslintrc.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* eslint-env node */
-module.exports = {
-    root: true,
-    extends: [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/strict-type-checked",
-        "plugin:@typescript-eslint/stylistic-type-checked",
-    ],
-    plugins: ["@typescript-eslint"],
-    parser: "@typescript-eslint/parser",
-    parserOptions: {
-        project: true,
-    },
-    ignorePatterns: [".eslintrc.js", "app", "out", "dist"],
-    env: {
-        es2022: true,
-        node: true,
-    },
-    rules: {
-        /* Allow numbers to be used in template literals */
-        "@typescript-eslint/restrict-template-expressions": [
-            "error",
-            {
-                allowNumber: true,
-            },
-        ],
-        /* Allow void expressions as the entire body of an arrow function */
-        "@typescript-eslint/no-confusing-void-expression": [
-            "error",
-            {
-                ignoreArrowShorthand: true,
-            },
-        ],
-    },
-};
diff --git a/desktop/eslint.config.mjs b/desktop/eslint.config.mjs
new file mode 100644
index 0000000000..46e94d010d
--- /dev/null
+++ b/desktop/eslint.config.mjs
@@ -0,0 +1,43 @@
+// @ts-check
+
+import js from "@eslint/js";
+import ts from "typescript-eslint";
+
+export default ts.config(
+    js.configs.recommended,
+    ...ts.configs.strictTypeChecked,
+    ...ts.configs.stylisticTypeChecked,
+    {
+        // typescript-eslint needs this enabling type checked rules.
+        languageOptions: {
+            parserOptions: {
+                project: true,
+                tsconfigRootDir: import.meta.dirname,
+            },
+        },
+    },
+    {
+        // The list of (minimatch) globs to ignore. This needs to be the only
+        // key in this configuration object.
+        ignores: ["eslint.config.mjs", "app/", "out/", "dist/"],
+    },
+    {
+        // Rule customizations.
+        rules: {
+            // Allow numbers to be used in template literals.
+            "@typescript-eslint/restrict-template-expressions": [
+                "error",
+                {
+                    allowNumber: true,
+                },
+            ],
+            // Allow void expressions as the entire body of an arrow function.
+            "@typescript-eslint/no-confusing-void-expression": [
+                "error",
+                {
+                    ignoreArrowShorthand: true,
+                },
+            ],
+        },
+    },
+);
diff --git a/desktop/package.json b/desktop/package.json
index cea2a7c4a1..f786f24675 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -39,20 +39,21 @@
         "onnxruntime-node": "^1.17"
     },
     "devDependencies": {
+        "@eslint/js": "^9.4.0",
         "@tsconfig/node20": "^20.1.4",
         "@types/auto-launch": "^5.0",
+        "@types/eslint__js": "^8.42.3",
         "@types/ffmpeg-static": "^3.0",
-        "@typescript-eslint/eslint-plugin": "^7",
-        "@typescript-eslint/parser": "^7",
         "concurrently": "^8",
         "electron": "^30",
         "electron-builder": "25.0.0-alpha.6",
-        "eslint": "^9",
+        "eslint": "^9.4.0",
         "prettier": "^3",
         "prettier-plugin-organize-imports": "^3",
         "prettier-plugin-packagejson": "^2",
         "shx": "^0.3",
-        "typescript": "^5"
+        "typescript": "^5",
+        "typescript-eslint": "^7.11.0"
     },
     "packageManager": "yarn@1.22.21",
     "productName": "ente"
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index c1e1cf5c4a..0c6c590bf5 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -122,49 +122,54 @@
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
+"@eslint/config-array@^0.15.1":
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.15.1.tgz#1fa78b422d98f4e7979f2211a1fde137e26c7d61"
+  integrity sha512-K4gzNq+yymn/EVsXYmf+SBcBro8MTf+aXJZUphM96CdzUEr+ClGDvAbpmaEK+cGVigVXIgs9gNmvHAlrzzY5JQ==
+  dependencies:
+    "@eslint/object-schema" "^2.1.3"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
+
+"@eslint/eslintrc@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
+  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.6.0"
-    globals "^13.19.0"
+    espree "^10.0.1"
+    globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.57.0":
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+"@eslint/js@9.4.0", "@eslint/js@^9.4.0":
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.4.0.tgz#96a2edd37ec0551ce5f9540705be23951c008a0c"
+  integrity sha512-fdI7VJjP3Rvc70lC4xkFXHB0fiPeojiL1PxVG6t1ZvXQrarj893PweuBTujxDUFk0Fxj4R7PIIAZ/aiiyZPZcg==
+
+"@eslint/object-schema@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.3.tgz#e65ae80ee2927b4fd8c5c26b15ecacc2b2a6cc2a"
+  integrity sha512-HAbhAYKfsAC2EkTqve00ibWIZlaU74Z1EHwAjYr4PXF0YU2VEA1zSIKSSpKszRLRWwHzzRZXvK632u+uXzvsvw==
 
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.11.14":
-  version "0.11.14"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
-  dependencies:
-    "@humanwhocodes/object-schema" "^2.0.2"
-    debug "^4.3.1"
-    minimatch "^3.0.5"
-
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
-  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@humanwhocodes/retry@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
+  integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
 
 "@isaacs/fs-minipass@^4.0.0":
   version "4.0.1"
@@ -281,6 +286,26 @@
   dependencies:
     "@types/ms" "*"
 
+"@types/eslint@*":
+  version "8.56.10"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.10.tgz#eb2370a73bf04a901eeba8f22595c7ee0f7eb58d"
+  integrity sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/eslint__js@^8.42.3":
+  version "8.42.3"
+  resolved "https://registry.yarnpkg.com/@types/eslint__js/-/eslint__js-8.42.3.tgz#d1fa13e5c1be63a10b4e3afe992779f81c1179a0"
+  integrity sha512-alfG737uhmPdnvkrLdZLcEKJ/B8s9Y4hrZ+YAdzUeoArBlSUERA2E87ROfOaS4jd/C45fzOoZzidLc1IPwLqOw==
+  dependencies:
+    "@types/eslint" "*"
+
+"@types/estree@*":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
 "@types/ffmpeg-static@^3.0":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/ffmpeg-static/-/ffmpeg-static-3.0.3.tgz#605358ac6304507a75c2fd5fd861534837b19e2f"
@@ -298,6 +323,11 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
   integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
 
+"@types/json-schema@*":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/keyv@^3.1.4":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
@@ -349,7 +379,7 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^7":
+"@typescript-eslint/eslint-plugin@7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz#f90f0914657ead08e1c75f66939c926edeab42dd"
   integrity sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==
@@ -364,7 +394,7 @@
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@^7":
+"@typescript-eslint/parser@7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.11.0.tgz#525ad8bee54a8f015f134edd241d91b84ab64839"
   integrity sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==
@@ -430,11 +460,6 @@
     "@typescript-eslint/types" "7.11.0"
     eslint-visitor-keys "^3.4.3"
 
-"@ungap/structured-clone@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
-
 "@xmldom/xmldom@^0.8.8":
   version "0.8.10"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99"
@@ -450,7 +475,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.9.0:
+acorn@^8.11.3:
   version "8.11.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
@@ -1176,13 +1201,6 @@ dmg-license@^1.0.11:
     smart-buffer "^4.0.2"
     verror "^1.10.0"
 
-doctrine@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
-  dependencies:
-    esutils "^2.0.2"
-
 dot-prop@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
@@ -1329,54 +1347,55 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-scope@^7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+eslint-scope@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc"
+  integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@^8:
-  version "8.57.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+
+eslint@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.4.0.tgz#79150c3610ae606eb131f1d648d5f43b3d45f3cd"
+  integrity sha512-sjc7Y8cUD1IlwYcTS9qPSvGjAC8Ne9LctpxKKu3x/1IC9bnOg98Zy6GxEJUfr1NojMgVPlyANXYns8oE2c1TAA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.57.0"
-    "@humanwhocodes/config-array" "^0.11.14"
+    "@eslint/config-array" "^0.15.1"
+    "@eslint/eslintrc" "^3.1.0"
+    "@eslint/js" "9.4.0"
     "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.3.0"
     "@nodelib/fs.walk" "^1.2.8"
-    "@ungap/structured-clone" "^1.2.0"
     ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
-    doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.2"
-    eslint-visitor-keys "^3.4.3"
-    espree "^9.6.1"
+    eslint-scope "^8.0.1"
+    eslint-visitor-keys "^4.0.0"
+    espree "^10.0.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^8.0.0"
     find-up "^5.0.0"
     glob-parent "^6.0.2"
-    globals "^13.19.0"
-    graphemer "^1.4.0"
     ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
@@ -1386,14 +1405,14 @@ eslint@^8:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-espree@^9.6.0, espree@^9.6.1:
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+espree@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
   dependencies:
-    acorn "^8.9.0"
+    acorn "^8.11.3"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.1"
+    eslint-visitor-keys "^4.0.0"
 
 esquery@^1.4.2:
   version "1.5.0"
@@ -1490,12 +1509,12 @@ ffmpeg-static@^5.2:
     https-proxy-agent "^5.0.0"
     progress "^2.0.3"
 
-file-entry-cache@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+file-entry-cache@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
   dependencies:
-    flat-cache "^3.0.4"
+    flat-cache "^4.0.0"
 
 filelist@^1.0.4:
   version "1.0.4"
@@ -1526,14 +1545,13 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^3.0.4:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
-  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
+flat-cache@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
   dependencies:
     flatted "^3.2.9"
-    keyv "^4.5.3"
-    rimraf "^3.0.2"
+    keyv "^4.5.4"
 
 flatted@^3.2.9:
   version "3.3.1"
@@ -1723,12 +1741,10 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-globals@^13.19.0:
-  version "13.24.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
-  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
-  dependencies:
-    type-fest "^0.20.2"
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
 globalthis@^1.0.1:
   version "1.0.4"
@@ -2134,7 +2150,7 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-keyv@^4.0.0, keyv@^4.5.3:
+keyv@^4.0.0, keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -3250,11 +3266,6 @@ type-fest@^0.13.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
-type-fest@^0.20.2:
-  version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
-  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
-
 type-fest@^2.17.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
@@ -3265,6 +3276,15 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
+typescript-eslint@^7.11.0:
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.11.0.tgz#7a208fc1d178b3fed58e33ce37150ac6efecf1fb"
+  integrity sha512-ZKe3yHF/IS/kCUE4CGE3UgtK+Q7yRk1e9kwEI0rqm9XxMTd9P1eHe0LVVtrZ3oFuIQ2unJ9Xn0vTsLApzJ3aPw==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "7.11.0"
+    "@typescript-eslint/parser" "7.11.0"
+    "@typescript-eslint/utils" "7.11.0"
+
 typescript@^5, typescript@^5.3.3:
   version "5.4.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
diff --git a/web/docs/dependencies.md b/web/docs/dependencies.md
index 58860f8fac..10ee62e0ee 100644
--- a/web/docs/dependencies.md
+++ b/web/docs/dependencies.md
@@ -14,11 +14,13 @@ baseline for how our code be in all the workspaces in this (yarn) monorepo.
 They also need some support packages, which come from the leaf `@/build-config`
 package:
 
+-   [@eslint/js](https://eslint.org/) provides JavaScript ESLint functionality,
+    and provides the configuration recommended the  by ESLint team.
+
 -   [typescript-eslint](https://typescript-eslint.io/packages/typescript-eslint/)
-    \- Teaches ESLint how to read TypeScript syntax, provides TypeScript
-    specific ESLint rules, and set of default preset rulesets
-    (`typescript-eslint` is the new entry point, our yet-unmigrated packages use
-    the older method of separately including
+    \- provides TypeScript ESLint functionality and provides a set of
+    recommended configurations (`typescript-eslint` is the new entry point, our
+    yet-unmigrated packages use the older method of separately including
     [@typescript-eslint/parser](https://typescript-eslint.io/packages/eslint-plugin/)
     \- which tells ESLint how to read TypeScript syntax - and
     [@typescript-eslint/eslint-plugin](https://typescript-eslint.io/packages/eslint-plugin/)

From 0d3db30cac17846cbadc5232ec8dd123b2ea1b3a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 13:40:11 +0530
Subject: [PATCH 15/42] Remove false disables that have been fixed in eslint 9

---
 desktop/src/main/types/any-shell-escape.d.ts | 1 -
 desktop/src/preload.ts                       | 1 -
 desktop/src/thirdparty/clip-bpe-ts/mod.ts    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/desktop/src/main/types/any-shell-escape.d.ts b/desktop/src/main/types/any-shell-escape.d.ts
index b8777d2aed..4172cdb1ef 100644
--- a/desktop/src/main/types/any-shell-escape.d.ts
+++ b/desktop/src/main/types/any-shell-escape.d.ts
@@ -19,7 +19,6 @@
  *     curl -v -H "Location;" -H "User-Agent: FooBar's so-called ""Browser""" "http://www.daveeddy.com/?name=dave&age=24"
 Which is suitable for being executed by the shell.
  */
-/* eslint-disable no-unused-vars */
 declare module "any-shell-escape" {
     declare const shellescape: (args: readonly string | string[]) => string;
     export default shellescape;
diff --git a/desktop/src/preload.ts b/desktop/src/preload.ts
index 85475031d3..c6df891dc5 100644
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-unused-vars */
 /**
  * @file The preload script
  *
diff --git a/desktop/src/thirdparty/clip-bpe-ts/mod.ts b/desktop/src/thirdparty/clip-bpe-ts/mod.ts
index 4d00eef0e4..74126433be 100644
--- a/desktop/src/thirdparty/clip-bpe-ts/mod.ts
+++ b/desktop/src/thirdparty/clip-bpe-ts/mod.ts
@@ -373,7 +373,6 @@ export default class {
             return token + "</w>";
         }
 
-        // eslint-disable-next-line no-constant-condition
         while (1) {
             let bigram: [string, string] | null = null;
             let minRank = Infinity;

From c2bf99531a4f8da93e4afd05fc83005c326b10f0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 13:42:16 +0530
Subject: [PATCH 16/42] eslint . is now the default

> If you are using a flat configuration file (eslint.config.js), you can also
> omit the file arguments and ESLint will use .
>
> https://eslint.org/docs/latest/use/command-line-interface
---
 desktop/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop/package.json b/desktop/package.json
index f786f24675..182390ba55 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -17,8 +17,8 @@
         "dev-main": "tsc && electron .",
         "dev-renderer": "cd ../web && yarn install && yarn dev:photos",
         "postinstall": "electron-builder install-app-deps",
-        "lint": "yarn prettier --check --log-level warn . && eslint --ext .ts src && yarn tsc",
-        "lint-fix": "yarn prettier --write --log-level warn . && eslint --fix --ext .ts src && yarn tsc"
+        "lint": "yarn prettier --check --log-level warn . && yarn eslint && yarn tsc",
+        "lint-fix": "yarn prettier --write --log-level warn . && yarn eslint && yarn tsc"
     },
     "resolutions": {
         "jackspeak": "2.1.1"

From f716f3bed7eaa933428b945765a7f2375a10c216 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 13:50:36 +0530
Subject: [PATCH 17/42] prettier 3.3

https://prettier.io/blog/2024/06/01/3.3.0
---
 desktop/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 0c6c590bf5..0b867aa019 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -2721,9 +2721,9 @@ prettier-plugin-packagejson@^2:
     synckit "0.9.0"
 
 prettier@^3:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368"
-  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.0.tgz#d173ea0524a691d4c0b1181752f2b46724328cdf"
+  integrity sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==
 
 progress@^2.0.3:
   version "2.0.3"

From aad4d62f0501d12794c3ba3ec3b00efcc678a32a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 13:56:06 +0530
Subject: [PATCH 18/42] typescript-eslint is not ready yet

https://github.com/typescript-eslint/typescript-eslint/pull/9002#issuecomment-2106424400
---
 desktop/package.json |   2 +-
 desktop/yarn.lock    | 126 +++++++++++++++++++++++--------------------
 2 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/desktop/package.json b/desktop/package.json
index 182390ba55..0cb4f61715 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -53,7 +53,7 @@
         "prettier-plugin-packagejson": "^2",
         "shx": "^0.3",
         "typescript": "^5",
-        "typescript-eslint": "^7.11.0"
+        "typescript-eslint": "8.0.0-alpha.10"
     },
     "packageManager": "yarn@1.22.21",
     "productName": "ente"
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 0b867aa019..804d0d9283 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -323,7 +323,7 @@
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
   integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
 
-"@types/json-schema@*":
+"@types/json-schema@*", "@types/json-schema@^7.0.15":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -367,6 +367,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/semver@^7.5.8":
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
+
 "@types/verror@^1.10.3":
   version "1.10.10"
   resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.10.tgz#d5a4b56abac169bfbc8b23d291363a682e6fa087"
@@ -379,62 +384,64 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz#f90f0914657ead08e1c75f66939c926edeab42dd"
-  integrity sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==
+"@typescript-eslint/eslint-plugin@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.0.0-alpha.10.tgz#a102e40da7b72a2981cb2da43064d9b3c865ca58"
+  integrity sha512-jsNKqn41nIS8jz5Li5xsueGEBBmRYLaflUKlclEkj8cWrO1tMK1/7xITeiVz7ZlNFZF2nop2NlXrbLtRpLEzhg==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.11.0"
-    "@typescript-eslint/type-utils" "7.11.0"
-    "@typescript-eslint/utils" "7.11.0"
-    "@typescript-eslint/visitor-keys" "7.11.0"
+    "@typescript-eslint/scope-manager" "8.0.0-alpha.10"
+    "@typescript-eslint/type-utils" "8.0.0-alpha.10"
+    "@typescript-eslint/utils" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
+    debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
+    semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.11.0.tgz#525ad8bee54a8f015f134edd241d91b84ab64839"
-  integrity sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==
+"@typescript-eslint/parser@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.0.0-alpha.10.tgz#fbefd39da010d65407b985f2b5c6e0a79bc8a6f4"
+  integrity sha512-4EerPviLfBKgExHARehJgWrCtX2a7+PXBc0LBPlH93ypSgj0LU1ejMgjrB0gcfd6bJ7LN/UGNAAy3B7/Y785sA==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.11.0"
-    "@typescript-eslint/types" "7.11.0"
-    "@typescript-eslint/typescript-estree" "7.11.0"
-    "@typescript-eslint/visitor-keys" "7.11.0"
+    "@typescript-eslint/scope-manager" "8.0.0-alpha.10"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/typescript-estree" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz#cf5619b01de62a226a59add15a02bde457335d1d"
-  integrity sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==
+"@typescript-eslint/scope-manager@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.0.0-alpha.10.tgz#25506ce51ab64e99f2bc0b7d3f0f82656e14a794"
+  integrity sha512-SUU0yhqehjuWilWRJWfhcxf6eMKVrZ3bpV2w6NF6GmBHR3FJo6oWZYLVXP04s6//INxpC2ynvKSglo4LRzWVTw==
   dependencies:
-    "@typescript-eslint/types" "7.11.0"
-    "@typescript-eslint/visitor-keys" "7.11.0"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
 
-"@typescript-eslint/type-utils@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz#ac216697d649084fedf4a910347b9642bd0ff099"
-  integrity sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==
+"@typescript-eslint/type-utils@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.0.0-alpha.10.tgz#d27f0fdd81450380887b3a07297440ba3588a70e"
+  integrity sha512-6aTcbnDZWKgKr3gquECJSFyvXWLSKtUHrk2ZXDP4DEzmzTDjrkY7tIQpqv4SczPQJ+3/aky3ArPhtnQYJbAMzg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "7.11.0"
-    "@typescript-eslint/utils" "7.11.0"
+    "@typescript-eslint/typescript-estree" "8.0.0-alpha.10"
+    "@typescript-eslint/utils" "8.0.0-alpha.10"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.11.0.tgz#5e9702a5e8b424b7fc690e338d359939257d6722"
-  integrity sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==
+"@typescript-eslint/types@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.0.0-alpha.10.tgz#89be400c6a1751fe86f5917ed8087ec100e002da"
+  integrity sha512-prbN+b/I4yH6H43WmyenMz8K5e34Hs73BQuWXR4wwij3Cg2xNGLPcpjr2cKWKlH4dZQPTz6R6oBeC+LfaoKi8g==
 
-"@typescript-eslint/typescript-estree@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz#7cbc569bc7336c3a494ceaf8204fdee5d5dbb7fa"
-  integrity sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==
+"@typescript-eslint/typescript-estree@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.0.0-alpha.10.tgz#e850056d2a5029688269a60206dec3bbd7beb953"
+  integrity sha512-8wBUIhu6IRa440hv5/0ZEnb5JLp/UsfzIXYKRwICUOMTVj2ss1n+w3m1CtT5ghVWy5Z05qkscsbhlKFmZguU8w==
   dependencies:
-    "@typescript-eslint/types" "7.11.0"
-    "@typescript-eslint/visitor-keys" "7.11.0"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/visitor-keys" "8.0.0-alpha.10"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -442,22 +449,25 @@
     semver "^7.6.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.11.0.tgz#524f047f2209959424c3ef689b0d83b3bc09919c"
-  integrity sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==
+"@typescript-eslint/utils@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.0.0-alpha.10.tgz#b77f743227353bfa493e95409c0e079044c9258e"
+  integrity sha512-WZyNf49CuvaW/whz/B8XjYwXE/wm/EQAXq+Vqgp6BrJb8SC3bMCwGuUxReNDN1o+dNdOC96ofVSvqa8NUQ65Jg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.11.0"
-    "@typescript-eslint/types" "7.11.0"
-    "@typescript-eslint/typescript-estree" "7.11.0"
+    "@types/json-schema" "^7.0.15"
+    "@types/semver" "^7.5.8"
+    "@typescript-eslint/scope-manager" "8.0.0-alpha.10"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
+    "@typescript-eslint/typescript-estree" "8.0.0-alpha.10"
+    semver "^7.6.0"
 
-"@typescript-eslint/visitor-keys@7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz#2c50cd292e67645eec05ac0830757071b4a4d597"
-  integrity sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==
+"@typescript-eslint/visitor-keys@8.0.0-alpha.10":
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.0.0-alpha.10.tgz#d0a9250c69cc2f73c7f423c36183d222a329e260"
+  integrity sha512-UohTNnT7S29uQgXsGZY489nWmoBBSJucNdRvog62R1QX9pQQb2pKVV1kHepUxoY2vd+M4tb9SQwZQ3gPNgqQ6w==
   dependencies:
-    "@typescript-eslint/types" "7.11.0"
+    "@typescript-eslint/types" "8.0.0-alpha.10"
     eslint-visitor-keys "^3.4.3"
 
 "@xmldom/xmldom@^0.8.8":
@@ -3276,14 +3286,14 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^7.11.0:
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.11.0.tgz#7a208fc1d178b3fed58e33ce37150ac6efecf1fb"
-  integrity sha512-ZKe3yHF/IS/kCUE4CGE3UgtK+Q7yRk1e9kwEI0rqm9XxMTd9P1eHe0LVVtrZ3oFuIQ2unJ9Xn0vTsLApzJ3aPw==
+typescript-eslint@8.0.0-alpha.10:
+  version "8.0.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.0.0-alpha.10.tgz#2172d41ab30c8447927c3823c5a549b9c09be89f"
+  integrity sha512-iMbN7boDtUmcSDor/J022+H4G018W3r3RSUUr7yoghMTmFuKVIkI89xJHDg82DBGYkA0xOoDNPBr7XfRFbEXKQ==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "7.11.0"
-    "@typescript-eslint/parser" "7.11.0"
-    "@typescript-eslint/utils" "7.11.0"
+    "@typescript-eslint/eslint-plugin" "8.0.0-alpha.10"
+    "@typescript-eslint/parser" "8.0.0-alpha.10"
+    "@typescript-eslint/utils" "8.0.0-alpha.10"
 
 typescript@^5, typescript@^5.3.3:
   version "5.4.5"

From 22b9bc78042a85aebd75ba607590b0a52222b704 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 13:57:41 +0530
Subject: [PATCH 19/42] onnx runtime 1.18

https://github.com/microsoft/onnxruntime/releases/tag/v1.18.0
https://stackoverflow.com/questions/70077595/is-32-bit-arm-windows-considered-dead-deprecated
---
 desktop/yarn.lock | 61 ++++++++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 804d0d9283..5c51a4676b 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -1705,7 +1705,7 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^10.3.10, glob@^10.3.7:
+glob@^10.3.10:
   version "10.3.12"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b"
   integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==
@@ -1716,6 +1716,17 @@ glob@^10.3.10, glob@^10.3.7:
     minipass "^7.0.4"
     path-scurry "^1.10.2"
 
+glob@^10.3.7:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
+
 glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -2073,7 +2084,7 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jackspeak@2.1.1, jackspeak@^2.3.6:
+jackspeak@2.1.1, jackspeak@^2.3.6, jackspeak@^3.1.2:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd"
   integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw==
@@ -2401,10 +2412,10 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4, minipass@^7.1.0, minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
@@ -2551,17 +2562,17 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-onnxruntime-common@1.17.3:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.17.3.tgz#aadc456477873a540ee3d611ae9cd4f3de7c43e5"
-  integrity sha512-IkbaDelNVX8cBfHFgsNADRIq2TlXMFWW+nG55mwWvQT4i0NZb32Jf35Pf6h9yjrnK78RjcnlNYaI37w394ovMw==
+onnxruntime-common@1.18.0:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.18.0.tgz#b904dc6ff134e7f21a3eab702fac17538f59e116"
+  integrity sha512-lufrSzX6QdKrktAELG5x5VkBpapbCeS3dQwrXbN0eD9rHvU0yAWl7Ztju9FvgAKWvwd/teEKJNj3OwM6eTZh3Q==
 
 onnxruntime-node@^1.17:
-  version "1.17.3"
-  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.17.3.tgz#53b8b7ef68bf3834bba9d7be592e4c2d718d2018"
-  integrity sha512-NtbN1pfApTSEjVq46LrJ396aPP2Gjhy+oYZi5Bu1leDXAEvVap/BQ8CZELiLs7z0UnXy3xjJW23HiB4P3//FIw==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.18.0.tgz#ad3947365ca038ec3a16fa4c48972708ccd294e9"
+  integrity sha512-iTnFcxKpmywCatx8ov4GTbECe3tJk2Bp1OA2mWRJde78q+7tpPYBhKMnwhlaoKy9oKQcy4UoEuuhoy2PSD13ww==
   dependencies:
-    onnxruntime-common "1.17.3"
+    onnxruntime-common "1.18.0"
     tar "^7.0.1"
 
 optionator@^0.9.3:
@@ -2673,10 +2684,10 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-path-scurry@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7"
-  integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==
+path-scurry@^1.10.2, path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
   dependencies:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -2885,9 +2896,9 @@ rimraf@^3.0.2:
     glob "^7.1.3"
 
 rimraf@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf"
-  integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.7.tgz#27bddf202e7d89cb2e0381656380d1734a854a74"
+  integrity sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==
   dependencies:
     glob "^10.3.7"
 
@@ -3194,13 +3205,13 @@ tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2:
     yallist "^4.0.0"
 
 tar@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-7.0.1.tgz#8f6ccebcd91b69e9767a6fc4892799e8b0e606d5"
-  integrity sha512-IjMhdQMZFpKsHEQT3woZVxBtCQY+0wk3CVxdRkGXEgyGa0dNS/ehPvOMr2nmfC7x5Zj2N+l6yZUpmICjLGS35w==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-7.2.0.tgz#f03ae6ecd2e2bab880f2ef33450f502e761d7548"
+  integrity sha512-hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w==
   dependencies:
     "@isaacs/fs-minipass" "^4.0.0"
     chownr "^3.0.0"
-    minipass "^5.0.0"
+    minipass "^7.1.0"
     minizlib "^3.0.1"
     mkdirp "^3.0.1"
     yallist "^5.0.0"

From 37f09c0dc3e89cc6ffd832a4f0f5535b4b3a2698 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 14:03:33 +0530
Subject: [PATCH 20/42] yarn upgrade-interactive electron electron-log

---
 desktop/yarn.lock | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 5c51a4676b..7a63844861 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -341,9 +341,9 @@
   integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==
 
 "@types/node@*", "@types/node@^20.9.0":
-  version "20.12.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.12.tgz#7cbecdf902085cec634fdb362172dfe12b8f2050"
-  integrity sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==
+  version "20.13.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.13.0.tgz#011a76bc1e71ae9a026dddcfd7039084f752c4b6"
+  integrity sha512-FM6AOb3khNkNIXPnHFDYaHerSv8uN22C91z098AnGccVu+Pcdhi+pNUFDi0iLmPIsVE0JBD0KVS7mzUYt4nRzQ==
   dependencies:
     undici-types "~5.26.4"
 
@@ -1082,14 +1082,14 @@ debounce-fn@^4.0.0:
   dependencies:
     mimic-fn "^3.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debug@^4.3.4:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
   integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
@@ -1253,9 +1253,9 @@ electron-builder@25.0.0-alpha.6:
     yargs "^17.6.2"
 
 electron-log@^5.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.2.tgz#fb40ad7f4ae694dd0e4c02c662d1a65c03e1243e"
-  integrity sha512-Cpg4hAZ27yM9wzE77c4TvgzxzavZ+dVltCczParXN+Vb3jocojCSAuSMCVOI9fhFuuOR+iuu3tZLX1cu0y0kgQ==
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.5.tgz#70d5051fc5ab7669b2592f53f72034867269c96e"
+  integrity sha512-vuq10faUAxRbILgQx7yHoMObKZDEfj7hMSZrJPsVrDNeCpV/HN11dU7QuY4UDUe055pzBxhSCB3m0+6D3Aktjw==
 
 electron-publish@25.0.0-alpha.6:
   version "25.0.0-alpha.6"
@@ -1293,9 +1293,9 @@ electron-updater@^6.2:
     tiny-typed-emitter "^2.1.0"
 
 electron@^30:
-  version "30.0.6"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.6.tgz#9ddea5f68396ecca88ad7c2c466a30fc9c16144b"
-  integrity sha512-PkhEPFdpYcTzjAO3gMHZ+map7g2+xCrMDedo/L1i0ir2BRXvAB93IkTJX497U6Srb/09r2cFt+k20VPNVCdw3Q==
+  version "30.0.9"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-30.0.9.tgz#b11400e4642a4b635e79244ba365f1d401ee60b5"
+  integrity sha512-ArxgdGHVu3o5uaP+Tqj8cJDvU03R6vrGrOqiMs7JXLnvQHMqXJIIxmFKQAIdJW8VoT3ac3hD21tA7cPO10RLow==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^20.9.0"

From d38ea56492b1274233beefc2727cd570fff3f9d8 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 14:06:06 +0530
Subject: [PATCH 21/42] Upgrade more

---
 desktop/package.json |  4 +-
 desktop/yarn.lock    | 92 +++++++++++++++++++++++++++++---------------
 2 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/desktop/package.json b/desktop/package.json
index 0cb4f61715..80404e5c11 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -36,7 +36,7 @@
         "jpeg-js": "^0.4",
         "next-electron-server": "^1",
         "node-stream-zip": "^1.15",
-        "onnxruntime-node": "^1.17"
+        "onnxruntime-node": "^1.18"
     },
     "devDependencies": {
         "@eslint/js": "^9.4.0",
@@ -46,7 +46,7 @@
         "@types/ffmpeg-static": "^3.0",
         "concurrently": "^8",
         "electron": "^30",
-        "electron-builder": "25.0.0-alpha.6",
+        "electron-builder": "25.0.0-alpha.8",
         "eslint": "^9.4.0",
         "prettier": "^3",
         "prettier-plugin-organize-imports": "^3",
diff --git a/desktop/yarn.lock b/desktop/yarn.lock
index 7a63844861..78f98106ef 100644
--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -65,10 +65,10 @@
     fs-extra "^9.0.1"
     promise-retry "^2.0.1"
 
-"@electron/osx-sign@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8"
-  integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==
+"@electron/osx-sign@1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.3.0.tgz#bd6fb60c519b76ca8a000e5801f5685690e8adad"
+  integrity sha512-TEXhxlYSDRr9JWK5nWdOv5MtuUdaZ412uxIIEQ0hLt80o0HYWtQJBlW5QmrQDMtebzATaOjKG9UfCzLyA90zWQ==
   dependencies:
     compare-version "^0.1.2"
     debug "^4.3.4"
@@ -574,14 +574,14 @@ app-builder-bin@4.0.0:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
   integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
 
-app-builder-lib@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.0.0-alpha.6.tgz#3edb49843b249a1dd52b32a80f9787677bc5a32b"
-  integrity sha512-kXveR7MFTJXBwb2xB2geKWeWP+YGcJ3IzWRgTEV96zwyo4IxzE5xRXcndSQQglmlzw/VoM5Mx322E9ErYbMCVg==
+app-builder-lib@25.0.0-alpha.8:
+  version "25.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.0.0-alpha.8.tgz#e8065005b0b5d43f22153ac72101f71bf4e1022b"
+  integrity sha512-d/pcaTcDv3gfdl9AGGP/DKvc+A+TdJmG15f+vqPeEGKOoqLE0ukReaEevXAtH3wOOs5CqgX6QgNPdszeeqFn3Q==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
     "@electron/notarize" "2.3.0"
-    "@electron/osx-sign" "1.0.5"
+    "@electron/osx-sign" "1.3.0"
     "@electron/rebuild" "3.6.0"
     "@electron/universal" "2.0.1"
     "@malept/flatpak-bundler" "^0.4.0"
@@ -593,7 +593,7 @@ app-builder-lib@25.0.0-alpha.6:
     chromium-pickle-js "^0.2.0"
     debug "^4.3.4"
     ejs "^3.1.8"
-    electron-publish "25.0.0-alpha.6"
+    electron-publish "25.0.0-alpha.7"
     form-data "^4.0.0"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
@@ -602,7 +602,7 @@ app-builder-lib@25.0.0-alpha.6:
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
     minimatch "^5.1.1"
-    read-config-file "6.3.2"
+    read-config-file "6.4.0"
     sanitize-filename "^1.6.3"
     semver "^7.3.8"
     tar "^6.1.12"
@@ -1034,6 +1034,14 @@ conf@^10.2.0:
     pkg-up "^3.1.0"
     semver "^7.3.5"
 
+config-file-ts@0.2.8-rc1:
+  version "0.2.8-rc1"
+  resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz#fb7fc6ccb2e313f69dbeb78f1db0b00038049de0"
+  integrity sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==
+  dependencies:
+    glob "^10.3.12"
+    typescript "^5.4.3"
+
 config-file-ts@^0.2.4:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.6.tgz#b424ff74612fb37f626d6528f08f92ddf5d22027"
@@ -1183,12 +1191,12 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.0.0-alpha.6.tgz#1a13008de0543c3080595534ab294cde2a5e57e8"
-  integrity sha512-GStVExwsuumGN6rPGJksA5bLN5n5QEQd5iQrGKyBSxuwR1+LWidFkM+anroXnANIyTwbppk2S7+808vHjT/Eyw==
+dmg-builder@25.0.0-alpha.8:
+  version "25.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.0.0-alpha.8.tgz#fe887023ffc9ce72dfd2472303a76ec008a156d2"
+  integrity sha512-1/Sfl1sQugHkHEobFafyx1HcmgkFj8pV7HFEK0NQ8bH5K2qsGvknjAeHjtYhV2sBoSNGod4P0SfbScS6p6h4eg==
   dependencies:
-    app-builder-lib "25.0.0-alpha.6"
+    app-builder-lib "25.0.0-alpha.8"
     builder-util "25.0.0-alpha.6"
     builder-util-runtime "9.2.5-alpha.2"
     fs-extra "^10.1.0"
@@ -1218,11 +1226,23 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
+dotenv-expand@^11.0.6:
+  version "11.0.6"
+  resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-11.0.6.tgz#f2c840fd924d7c77a94eff98f153331d876882d3"
+  integrity sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==
+  dependencies:
+    dotenv "^16.4.4"
+
 dotenv-expand@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
+dotenv@^16.4.4, dotenv@^16.4.5:
+  version "16.4.5"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
+  integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
+
 dotenv@^9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05"
@@ -1235,16 +1255,16 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.0.0-alpha.6.tgz#a72f96f7029539ac28f92ce5c83f872ba3b6e7c1"
-  integrity sha512-qXzzdID2W9hhx3TXddwXv1C5HsqjF6bKnftUtywAB/gtDwu+neifPZvnXDNHI4ZamRrZpJJH59esfkqkc2KNSQ==
+electron-builder@25.0.0-alpha.8:
+  version "25.0.0-alpha.8"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.0.0-alpha.8.tgz#7238623cf7a753d0da31f16daea8767d0ef6d572"
+  integrity sha512-nfrtTljEZackbhJE1BcK+RFXrPvrkrBo0TgR0gH2GxNhPiRTwj/S24K3zHbYj6vBaDVtnqlS6Mqm8tMUrRU4tA==
   dependencies:
-    app-builder-lib "25.0.0-alpha.6"
+    app-builder-lib "25.0.0-alpha.8"
     builder-util "25.0.0-alpha.6"
     builder-util-runtime "9.2.5-alpha.2"
     chalk "^4.1.2"
-    dmg-builder "25.0.0-alpha.6"
+    dmg-builder "25.0.0-alpha.8"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
@@ -1257,10 +1277,10 @@ electron-log@^5.1:
   resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.1.5.tgz#70d5051fc5ab7669b2592f53f72034867269c96e"
   integrity sha512-vuq10faUAxRbILgQx7yHoMObKZDEfj7hMSZrJPsVrDNeCpV/HN11dU7QuY4UDUe055pzBxhSCB3m0+6D3Aktjw==
 
-electron-publish@25.0.0-alpha.6:
-  version "25.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.0.0-alpha.6.tgz#8af3cb6e2435c00b8c71de43c330483808df5924"
-  integrity sha512-Hin+6j+jiXBc5g6Wlv9JB5Xu7MADBHxZAndt4WE7luCw7b3+OJdQeDvD/uYiCLpiG8cc2NLxu4MyBSVu86MrJA==
+electron-publish@25.0.0-alpha.7:
+  version "25.0.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.0.0-alpha.7.tgz#3c1944c8890b22d5f674772bf16c5382da248861"
+  integrity sha512-d9R6Jnds3PjzBM4Wt3nRn9ramkbM3kBzt9a6WHQL4/09ByyZGZ1Cu9GS9atRCkH3tBJlOIotUYVhVO36lk3sAA==
   dependencies:
     "@types/fs-extra" "^9.0.11"
     builder-util "25.0.0-alpha.6"
@@ -1716,7 +1736,7 @@ glob@^10.3.10:
     minipass "^7.0.4"
     path-scurry "^1.10.2"
 
-glob@^10.3.7:
+glob@^10.3.12, glob@^10.3.7:
   version "10.4.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
   integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
@@ -2150,7 +2170,7 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^2.2.0:
+json5@^2.2.0, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -2567,7 +2587,7 @@ onnxruntime-common@1.18.0:
   resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.18.0.tgz#b904dc6ff134e7f21a3eab702fac17538f59e116"
   integrity sha512-lufrSzX6QdKrktAELG5x5VkBpapbCeS3dQwrXbN0eD9rHvU0yAWl7Ztju9FvgAKWvwd/teEKJNj3OwM6eTZh3Q==
 
-onnxruntime-node@^1.17:
+onnxruntime-node@^1.18:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.18.0.tgz#ad3947365ca038ec3a16fa4c48972708ccd294e9"
   integrity sha512-iTnFcxKpmywCatx8ov4GTbECe3tJk2Bp1OA2mWRJde78q+7tpPYBhKMnwhlaoKy9oKQcy4UoEuuhoy2PSD13ww==
@@ -2806,6 +2826,18 @@ read-config-file@6.3.2:
     json5 "^2.2.0"
     lazy-val "^1.0.4"
 
+read-config-file@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.4.0.tgz#970542833216cccff6b1d83320495003dcf85a45"
+  integrity sha512-uB5QOBeF84PT61GlV11OTV4jUGHAO3iDEOP6v9ygxhG6Bs9PLg7WsjNT6mtIX2G+x8lJTr4ZWNeG6LDTKkNf2Q==
+  dependencies:
+    config-file-ts "0.2.8-rc1"
+    dotenv "^16.4.5"
+    dotenv-expand "^11.0.6"
+    js-yaml "^4.1.0"
+    json5 "^2.2.3"
+    lazy-val "^1.0.5"
+
 readable-stream@^3.0.2, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
@@ -3306,7 +3338,7 @@ typescript-eslint@8.0.0-alpha.10:
     "@typescript-eslint/parser" "8.0.0-alpha.10"
     "@typescript-eslint/utils" "8.0.0-alpha.10"
 
-typescript@^5, typescript@^5.3.3:
+typescript@^5, typescript@^5.3.3, typescript@^5.4.3:
   version "5.4.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
   integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==

From 27b7532ca4477873c397310d30c2739238672209 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 14:15:13 +0530
Subject: [PATCH 22/42] lf

---
 web/docs/dependencies.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/docs/dependencies.md b/web/docs/dependencies.md
index 10ee62e0ee..fba1eb66da 100644
--- a/web/docs/dependencies.md
+++ b/web/docs/dependencies.md
@@ -15,7 +15,7 @@ They also need some support packages, which come from the leaf `@/build-config`
 package:
 
 -   [@eslint/js](https://eslint.org/) provides JavaScript ESLint functionality,
-    and provides the configuration recommended the  by ESLint team.
+    and provides the configuration recommended the by ESLint team.
 
 -   [typescript-eslint](https://typescript-eslint.io/packages/typescript-eslint/)
     \- provides TypeScript ESLint functionality and provides a set of

From ebab8568b99835aeecf4dc442759496e78d30159 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 14:31:01 +0530
Subject: [PATCH 23/42] Prune old config

---
 web/packages/eslint-config/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/packages/eslint-config/index.js b/web/packages/eslint-config/index.js
index ee73deae37..71544f0ef7 100644
--- a/web/packages/eslint-config/index.js
+++ b/web/packages/eslint-config/index.js
@@ -4,7 +4,6 @@ module.exports = {
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
-        "prettier",
     ],
     parserOptions: {
         tsconfigRootDir: __dirname,

From bf2a97f4a19bafe2449bf280c254dc603bdd84e1 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 14:40:34 +0530
Subject: [PATCH 24/42] Prune (prep for eslint 9)

---
 web/apps/accounts/.eslintrc.js          | 2 +-
 web/apps/cast/.eslintrc.js              | 2 +-
 web/apps/photos/.eslintrc.js            | 8 +++++++-
 web/packages/eslint-config/.eslintrc.js | 2 +-
 web/packages/eslint-config/empty.js     | 0
 web/packages/eslint-config/index.js     | 7 -------
 web/packages/shared/.eslintrc.js        | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 web/packages/eslint-config/empty.js

diff --git a/web/apps/accounts/.eslintrc.js b/web/apps/accounts/.eslintrc.js
index b1c4c2e168..f133a685b7 100644
--- a/web/apps/accounts/.eslintrc.js
+++ b/web/apps/accounts/.eslintrc.js
@@ -9,5 +9,5 @@ module.exports = {
         tsconfigRootDir: __dirname,
         project: "./tsconfig.json",
     },
-    ignorePatterns: [".eslintrc.js", "out"],
+    ignorePatterns: [".eslintrc.js", "out", "next.config.js"],
 };
diff --git a/web/apps/cast/.eslintrc.js b/web/apps/cast/.eslintrc.js
index b1c4c2e168..f133a685b7 100644
--- a/web/apps/cast/.eslintrc.js
+++ b/web/apps/cast/.eslintrc.js
@@ -9,5 +9,5 @@ module.exports = {
         tsconfigRootDir: __dirname,
         project: "./tsconfig.json",
     },
-    ignorePatterns: [".eslintrc.js", "out"],
+    ignorePatterns: [".eslintrc.js", "out", "next.config.js"],
 };
diff --git a/web/apps/photos/.eslintrc.js b/web/apps/photos/.eslintrc.js
index fdec1a6b99..4eabc44fff 100644
--- a/web/apps/photos/.eslintrc.js
+++ b/web/apps/photos/.eslintrc.js
@@ -9,5 +9,11 @@ module.exports = {
         tsconfigRootDir: __dirname,
         project: "./tsconfig.json",
     },
-    ignorePatterns: [".eslintrc.js", "out", "thirdparty", "public"],
+    ignorePatterns: [
+        ".eslintrc.js",
+        "out",
+        "thirdparty",
+        "public",
+        "next.config.js",
+    ],
 };
diff --git a/web/packages/eslint-config/.eslintrc.js b/web/packages/eslint-config/.eslintrc.js
index fa1fde4acd..d8576680e3 100644
--- a/web/packages/eslint-config/.eslintrc.js
+++ b/web/packages/eslint-config/.eslintrc.js
@@ -5,5 +5,5 @@ module.exports = {
         tsconfigRootDir: __dirname,
         project: "./tsconfig.json",
     },
-    ignorePatterns: [".eslintrc.js"],
+    ignorePatterns: [".eslintrc.js", "index.js"],
 };
diff --git a/web/packages/eslint-config/empty.js b/web/packages/eslint-config/empty.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/web/packages/eslint-config/index.js b/web/packages/eslint-config/index.js
index 71544f0ef7..41da4b9ce3 100644
--- a/web/packages/eslint-config/index.js
+++ b/web/packages/eslint-config/index.js
@@ -1,6 +1,5 @@
 module.exports = {
     extends: [
-        "next/core-web-vitals",
         "eslint:recommended",
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
@@ -33,12 +32,6 @@ module.exports = {
             "after",
             { overrides: { "?": "before", ":": "before" } },
         ],
-        "import/no-anonymous-default-export": [
-            "error",
-            {
-                allowNew: true,
-            },
-        ],
         "@typescript-eslint/no-unsafe-member-access": "off",
         "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/no-unsafe-assignment": "off",
diff --git a/web/packages/shared/.eslintrc.js b/web/packages/shared/.eslintrc.js
index 556f3b6392..1fc7db29af 100644
--- a/web/packages/shared/.eslintrc.js
+++ b/web/packages/shared/.eslintrc.js
@@ -9,5 +9,5 @@ module.exports = {
         tsconfigRootDir: __dirname,
         project: "./tsconfig.json",
     },
-    ignorePatterns: [".eslintrc.js"],
+    ignorePatterns: [".eslintrc.js", "next/utils/headers.js"],
 };

From 14e4c3a1338789a8c1f202f36af801f5847dd664 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 15:06:21 +0530
Subject: [PATCH 25/42] Fix circular dependency warning

---
 web/apps/photos/src/services/face/indexer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/apps/photos/src/services/face/indexer.ts b/web/apps/photos/src/services/face/indexer.ts
index 7b446b42e1..8c4eeb0cf7 100644
--- a/web/apps/photos/src/services/face/indexer.ts
+++ b/web/apps/photos/src/services/face/indexer.ts
@@ -13,7 +13,7 @@ import {
     indexedAndIndexableCounts,
     syncWithLocalFiles,
 } from "./db";
-import { FaceIndexerWorker } from "./indexer.worker";
+import { type FaceIndexerWorker } from "./indexer.worker";
 
 /**
  * Face indexing orchestrator.

From 1360378aaac2c3fca7722307501ba2ad670a49ea Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 15:19:13 +0530
Subject: [PATCH 26/42] Fix circular dependency warning

> Circular dependency between chunks with runtime
  (src_services_face_face_worker_ts-src_services_face_index_ts-src_services_face_indexer_ts-src_-39d208,
  webpack)
---
 web/apps/photos/src/pages/_app.tsx            |   2 +-
 web/apps/photos/src/services/face/index.ts    |   8 --
 web/apps/photos/src/services/face/indexer.ts  | 115 +++++++++---------
 .../mlWorkManager.ts                          |   7 +-
 web/apps/photos/src/services/logout.ts        |   2 +-
 web/apps/photos/src/services/searchService.ts |   4 +-
 6 files changed, 68 insertions(+), 70 deletions(-)
 rename web/apps/photos/src/services/{machineLearning => face}/mlWorkManager.ts (97%)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index 5731b292a9..f71e503a27 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -55,7 +55,7 @@ import {
     setIsFaceIndexingEnabled,
 } from "services/face/indexer";
 import { photosLogout } from "services/logout";
-import mlWorkManager from "services/machineLearning/mlWorkManager";
+import mlWorkManager from "services/face/mlWorkManager";
 import {
     getFamilyPortalRedirectURL,
     getRoadmapRedirectURL,
diff --git a/web/apps/photos/src/services/face/index.ts b/web/apps/photos/src/services/face/index.ts
index 86fa9ab20b..e69de29bb2 100644
--- a/web/apps/photos/src/services/face/index.ts
+++ b/web/apps/photos/src/services/face/index.ts
@@ -1,8 +0,0 @@
-import { ComlinkWorker } from "@/next/worker/comlink-worker";
-import type { DedicatedMLWorker } from "services/face/face.worker";
-
-const createFaceWebWorker = () =>
-    new Worker(new URL("face.worker.ts", import.meta.url));
-
-export const createFaceComlinkWorker = (name: string) =>
-    new ComlinkWorker<typeof DedicatedMLWorker>(name, createFaceWebWorker());
diff --git a/web/apps/photos/src/services/face/indexer.ts b/web/apps/photos/src/services/face/indexer.ts
index 8c4eeb0cf7..1ab0a6b9aa 100644
--- a/web/apps/photos/src/services/face/indexer.ts
+++ b/web/apps/photos/src/services/face/indexer.ts
@@ -1,10 +1,8 @@
 import { ComlinkWorker } from "@/next/worker/comlink-worker";
 import { ensure } from "@/utils/ensure";
-import { wait } from "@/utils/promise";
-import { type Remote } from "comlink";
+import type { Remote } from "comlink";
 import { isBetaUser, isInternalUser } from "services/feature-flag";
 import { getAllLocalFiles } from "services/fileService";
-import mlWorkManager from "services/machineLearning/mlWorkManager";
 import type { EnteFile } from "types/file";
 import { isInternalUserForML } from "utils/user";
 import {
@@ -13,7 +11,7 @@ import {
     indexedAndIndexableCounts,
     syncWithLocalFiles,
 } from "./db";
-import { type FaceIndexerWorker } from "./indexer.worker";
+import type { FaceIndexerWorker } from "./indexer.worker";
 
 /**
  * Face indexing orchestrator.
@@ -41,33 +39,33 @@ class FaceIndexer {
     /** Timeout for when the next time we will wake up. */
     private wakeTimeout: ReturnType<typeof setTimeout> | undefined;
 
-    /**
-     * Add a file to the live indexing queue.
-     *
-     * @param enteFile An {@link EnteFile} that should be indexed.
-     *
-     * @param file The contents of {@link enteFile} as a web {@link File}
-     * object, if available.
-     */
-    enqueueFile(enteFile: EnteFile, file: File | undefined) {
-        // If face indexing is not enabled, don't enqueue anything. Later on if
-        // the user turns on face indexing these files will get indexed as part
-        // of the backfilling anyway, the live indexing is just an optimization.
-        if (!mlWorkManager.isMlSearchEnabled) return;
+    // /**
+    //  * Add a file to the live indexing queue.
+    //  *
+    //  * @param enteFile An {@link EnteFile} that should be indexed.
+    //  *
+    //  * @param file The contents of {@link enteFile} as a web {@link File}
+    //  * object, if available.
+    //  */
+    // enqueueFile(enteFile: EnteFile, file: File | undefined) {
+    //     // If face indexing is not enabled, don't enqueue anything. Later on if
+    //     // the user turns on face indexing these files will get indexed as part
+    //     // of the backfilling anyway, the live indexing is just an optimization.
+    //     if (!mlWorkManager.isMlSearchEnabled) return;
 
-        this.liveItems.push({ enteFile, file });
-        this.wakeUpIfNeeded();
-    }
+    //     this.liveItems.push({ enteFile, file });
+    //     this.wakeUpIfNeeded();
+    // }
 
-    private wakeUpIfNeeded() {
-        // Already awake.
-        if (!this.wakeTimeout) return;
-        // Cancel the alarm, wake up now.
-        clearTimeout(this.wakeTimeout);
-        this.wakeTimeout = undefined;
-        // Get to work.
-        this.tick();
-    }
+    // private wakeUpIfNeeded() {
+    //     // Already awake.
+    //     if (!this.wakeTimeout) return;
+    //     // Cancel the alarm, wake up now.
+    //     clearTimeout(this.wakeTimeout);
+    //     this.wakeTimeout = undefined;
+    //     // Get to work.
+    //     this.tick();
+    // }
 
     /* TODO-ML(MR): This code is not currently in use */
 
@@ -85,34 +83,34 @@ class FaceIndexer {
     faceIndexer = (): Promise<Remote<FaceIndexerWorker>> =>
         (this._faceIndexer ??= createFaceIndexerComlinkWorker().remote);
 
-    private async tick() {
-        console.log("tick");
+    //     private async tick() {
+    //         console.log("tick");
 
-        const item = this.liveItems.pop();
-        if (!item) {
-            // TODO-ML: backfill instead if needed here.
-            this.wakeTimeout = setTimeout(() => {
-                this.wakeTimeout = undefined;
-                this.wakeUpIfNeeded();
-            }, 30 * 1000);
-            return;
-        }
-        /*
-        const fileID = item.enteFile.id;
-        try {
-            const faceIndex = await indexFaces(item.enteFile, item.file, userAgent);
-            log.info(`faces in file ${fileID}`, faceIndex);
-        } catch (e) {
-            log.error(`Failed to index faces in file ${fileID}`, e);
-            markIndexingFailed(item.enteFile.id);
-        }
-*/
-        // Let the runloop drain.
-        await wait(0);
-        // Run again.
-        // TODO
-        // this.tick();
-    }
+    //         const item = this.liveItems.pop();
+    //         if (!item) {
+    //             // TODO-ML: backfill instead if needed here.
+    //             this.wakeTimeout = setTimeout(() => {
+    //                 this.wakeTimeout = undefined;
+    //                 this.wakeUpIfNeeded();
+    //             }, 30 * 1000);
+    //             return;
+    //         }
+    //         /*
+    //         const fileID = item.enteFile.id;
+    //         try {
+    //             const faceIndex = await indexFaces(item.enteFile, item.file, userAgent);
+    //             log.info(`faces in file ${fileID}`, faceIndex);
+    //         } catch (e) {
+    //             log.error(`Failed to index faces in file ${fileID}`, e);
+    //             markIndexingFailed(item.enteFile.id);
+    //         }
+    // */
+    //         // Let the runloop drain.
+    //         await wait(0);
+    //         // Run again.
+    //         // TODO
+    //         // this.tick();
+    //     }
 
     /**
      * Add a newly uploaded file to the face indexing queue.
@@ -162,8 +160,9 @@ export interface FaceIndexingStatus {
     nTotalFiles: number;
 }
 
-export const faceIndexingStatus = async (): Promise<FaceIndexingStatus> => {
-    const isSyncing = mlWorkManager.isSyncing;
+export const faceIndexingStatus = async (
+    isSyncing: boolean,
+): Promise<FaceIndexingStatus> => {
     const { indexedCount, indexableCount } = await indexedAndIndexableCounts();
 
     let phase: FaceIndexingStatus["phase"];
diff --git a/web/apps/photos/src/services/machineLearning/mlWorkManager.ts b/web/apps/photos/src/services/face/mlWorkManager.ts
similarity index 97%
rename from web/apps/photos/src/services/machineLearning/mlWorkManager.ts
rename to web/apps/photos/src/services/face/mlWorkManager.ts
index 867df8ef65..3e25864bae 100644
--- a/web/apps/photos/src/services/machineLearning/mlWorkManager.ts
+++ b/web/apps/photos/src/services/face/mlWorkManager.ts
@@ -7,12 +7,17 @@ import { eventBus, Events } from "@ente/shared/events";
 import { getToken, getUserID } from "@ente/shared/storage/localStorage/helpers";
 import debounce from "debounce";
 import PQueue from "p-queue";
-import { createFaceComlinkWorker } from "services/face";
 import type { DedicatedMLWorker } from "services/face/face.worker";
 import { EnteFile } from "types/file";
 
 export type JobState = "Scheduled" | "Running" | "NotScheduled";
 
+const createFaceWebWorker = () =>
+    new Worker(new URL("face.worker.ts", import.meta.url));
+
+const createFaceComlinkWorker = (name: string) =>
+    new ComlinkWorker<typeof DedicatedMLWorker>(name, createFaceWebWorker());
+
 export class MLSyncJob {
     private runCallback: () => Promise<boolean>;
     private state: JobState;
diff --git a/web/apps/photos/src/services/logout.ts b/web/apps/photos/src/services/logout.ts
index 9da892bad2..bad5259016 100644
--- a/web/apps/photos/src/services/logout.ts
+++ b/web/apps/photos/src/services/logout.ts
@@ -5,7 +5,7 @@ import DownloadManager from "./download";
 import exportService from "./export";
 import { clearFaceData } from "./face/db";
 import { clearFeatureFlagSessionState } from "./feature-flag";
-import mlWorkManager from "./machineLearning/mlWorkManager";
+import mlWorkManager from "./face/mlWorkManager";
 
 /**
  * Logout sequence for the photos app.
diff --git a/web/apps/photos/src/services/searchService.ts b/web/apps/photos/src/services/searchService.ts
index edc3899892..27786a2d3a 100644
--- a/web/apps/photos/src/services/searchService.ts
+++ b/web/apps/photos/src/services/searchService.ts
@@ -21,6 +21,7 @@ import { clipService, computeClipMatchScore } from "./clip-service";
 import { localCLIPEmbeddings } from "./embeddingService";
 import { getLatestEntities } from "./entityService";
 import { faceIndexingStatus, isFaceIndexingEnabled } from "./face/indexer";
+import mlWorkManager from "./face/mlWorkManager";
 import locationSearchService, { City } from "./locationSearchService";
 
 const DIGITS = new Set(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]);
@@ -178,7 +179,8 @@ export async function getAllPeopleSuggestion(): Promise<Array<Suggestion>> {
 
 export async function getIndexStatusSuggestion(): Promise<Suggestion> {
     try {
-        const indexStatus = await faceIndexingStatus();
+        const isSyncing = mlWorkManager.isSyncing;
+        const indexStatus = await faceIndexingStatus(isSyncing);
 
         let label: string;
         switch (indexStatus.phase) {

From 3f3a63d8da5ce6da9840e82f07bd14c3ab3a52c3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 15:49:17 +0530
Subject: [PATCH 27/42] Move

---
 web/apps/photos/src/services/face/indexer.ts                | 5 ++++-
 web/packages/new/package.json                               | 6 +++++-
 .../new/photos/services/feature-flags.ts}                   | 0
 web/packages/next/next.config.base.js                       | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
 rename web/{apps/photos/src/services/feature-flag.ts => packages/new/photos/services/feature-flags.ts} (100%)

diff --git a/web/apps/photos/src/services/face/indexer.ts b/web/apps/photos/src/services/face/indexer.ts
index 1ab0a6b9aa..b49c4dc053 100644
--- a/web/apps/photos/src/services/face/indexer.ts
+++ b/web/apps/photos/src/services/face/indexer.ts
@@ -1,7 +1,10 @@
+import {
+    isBetaUser,
+    isInternalUser,
+} from "@/new/photos/services/feature-flags";
 import { ComlinkWorker } from "@/next/worker/comlink-worker";
 import { ensure } from "@/utils/ensure";
 import type { Remote } from "comlink";
-import { isBetaUser, isInternalUser } from "services/feature-flag";
 import { getAllLocalFiles } from "services/fileService";
 import type { EnteFile } from "types/file";
 import { isInternalUserForML } from "utils/user";
diff --git a/web/packages/new/package.json b/web/packages/new/package.json
index dcfbf6cfc1..a54bd4ac7b 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -2,6 +2,10 @@
     "name": "@/new",
     "version": "0.0.0",
     "private": true,
-    "dependencies": {},
+    "dependencies": {
+        "@/next": "*",
+        "@/utils": "*",
+        "@ente/shared": "*"
+    },
     "devDependencies": {}
 }
diff --git a/web/apps/photos/src/services/feature-flag.ts b/web/packages/new/photos/services/feature-flags.ts
similarity index 100%
rename from web/apps/photos/src/services/feature-flag.ts
rename to web/packages/new/photos/services/feature-flags.ts
diff --git a/web/packages/next/next.config.base.js b/web/packages/next/next.config.base.js
index a3076fa5cd..812ed7618d 100644
--- a/web/packages/next/next.config.base.js
+++ b/web/packages/next/next.config.base.js
@@ -51,7 +51,7 @@ const nextConfig = {
         emotion: true,
     },
     // Use Next.js to transpile our internal packages before bundling them.
-    transpilePackages: ["@/next", "@/utils"],
+    transpilePackages: ["@/next", "@/utils", "@/new"],
 
     // Add environment variables to the JavaScript bundle. They will be
     // available as `process.env.VAR_NAME` to our code.

From f663c436cbd002272b0351722ca9ceb858cdb269 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 15:58:50 +0530
Subject: [PATCH 28/42] Add zod

zod required strict mode, which is why creating this "@/new" package was a prereq.
---
 web/docs/dependencies.md                      | 23 +++++++++++--------
 web/packages/new/package.json                 |  3 ++-
 .../new/photos/services/feature-flags.ts      | 14 +++++++++++
 web/yarn.lock                                 |  7 +++++-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/web/docs/dependencies.md b/web/docs/dependencies.md
index fba1eb66da..a0eee351fa 100644
--- a/web/docs/dependencies.md
+++ b/web/docs/dependencies.md
@@ -154,6 +154,19 @@ It is more lower level than Next, but the bells and whistles it doesn't have are
 the bells and whistles (and the accompanying complexity) that we don't need in
 some cases.
 
+## General
+
+-   [comlink](https://github.com/GoogleChromeLabs/comlink) provides a minimal
+    layer on top of Web Workers to make them more easier to use.
+
+-   [idb](https://github.com/jakearchibald/idb) provides a promise API over the
+    browser-native IndexedDB APIs.
+
+    > For more details about IDB and its role, see [storage.md](storage.md).
+
+-   [zod](https://github.com/colinhacks/zod) is used for runtime typechecking
+    (e.g. verifying that API responses match the expected TypeScript shape).
+
 ## Media
 
 -   [jszip](https://github.com/Stuk/jszip) is used for reading zip files in
@@ -167,16 +180,6 @@ some cases.
 -   [heic-convert](https://github.com/catdad-experiments/heic-convert) is used
     for converting HEIC files (which browsers don't natively support) into JPEG.
 
-## General
-
--   [comlink](https://github.com/GoogleChromeLabs/comlink) provides a minimal
-    layer on top of Web Workers to make them more easier to use.
-
--   [idb](https://github.com/jakearchibald/idb) provides a promise API over the
-    browser-native IndexedDB APIs.
-
-    > For more details about IDB and its role, see [storage.md](storage.md).
-
 ## Photos app specific
 
 -   [react-dropzone](https://github.com/react-dropzone/react-dropzone/) is a
diff --git a/web/packages/new/package.json b/web/packages/new/package.json
index a54bd4ac7b..6b3e55a065 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -5,7 +5,8 @@
     "dependencies": {
         "@/next": "*",
         "@/utils": "*",
-        "@ente/shared": "*"
+        "@ente/shared": "*",
+        "zod": "^3.23.8"
     },
     "devDependencies": {}
 }
diff --git a/web/packages/new/photos/services/feature-flags.ts b/web/packages/new/photos/services/feature-flags.ts
index 2dbca26731..340963ab84 100644
--- a/web/packages/new/photos/services/feature-flags.ts
+++ b/web/packages/new/photos/services/feature-flags.ts
@@ -2,6 +2,7 @@ import log from "@/next/log";
 import { ensure } from "@/utils/ensure";
 import { apiOrigin } from "@ente/shared/network/api";
 import { getToken } from "@ente/shared/storage/localStorage/helpers";
+import { z } from "zod";
 
 let _fetchTimeout: ReturnType<typeof setTimeout> | undefined;
 let _haveFetched = false;
@@ -64,6 +65,19 @@ const remoteFeatureFlags = () => {
     return JSON.parse(s);
 };
 
+const FeatureFlags = z.object({
+    internalUser: z
+        .boolean()
+        .nullish()
+        .transform((v) => (v === null ? undefined : v)),
+    betaUser: z
+        .boolean()
+        .nullish()
+        .transform((v) => (v === null ? undefined : v)),
+});
+
+type FeatureFlags = 
+
 const remoteFeatureFlagsFetchingIfNeeded = async () => {
     let ff = await remoteFeatureFlags();
     if (!ff) {
diff --git a/web/yarn.lock b/web/yarn.lock
index 226b3add6b..eaf097a431 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -3355,7 +3355,7 @@ libsodium-wrappers@0.7.9:
   dependencies:
     libsodium "^0.7.0"
 
-libsodium@0.7.9, libsodium@^0.7.0:
+libsodium@^0.7.0:
   version "0.7.9"
   resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.9.tgz#4bb7bcbf662ddd920d8795c227ae25bbbfa3821b"
   integrity sha512-gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A==
@@ -4992,6 +4992,11 @@ yup@^1.4:
     toposort "^2.0.2"
     type-fest "^2.19.0"
 
+zod@^3.23.8:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
+
 zxcvbn@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"

From 176289d0a81b3524e116e802f463befb3f040be4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 16:50:30 +0530
Subject: [PATCH 29/42] zod flags

---
 web/packages/new/package.json                 |  2 +-
 .../new/photos/services/feature-flags.ts      | 59 +++++++++----------
 web/packages/utils/transform.ts               |  3 +
 web/yarn.lock                                 |  4 +-
 4 files changed, 33 insertions(+), 35 deletions(-)
 create mode 100644 web/packages/utils/transform.ts

diff --git a/web/packages/new/package.json b/web/packages/new/package.json
index 6b3e55a065..72c80268f6 100644
--- a/web/packages/new/package.json
+++ b/web/packages/new/package.json
@@ -6,7 +6,7 @@
         "@/next": "*",
         "@/utils": "*",
         "@ente/shared": "*",
-        "zod": "^3.23.8"
+        "zod": "^3"
     },
     "devDependencies": {}
 }
diff --git a/web/packages/new/photos/services/feature-flags.ts b/web/packages/new/photos/services/feature-flags.ts
index 340963ab84..2f01953dbf 100644
--- a/web/packages/new/photos/services/feature-flags.ts
+++ b/web/packages/new/photos/services/feature-flags.ts
@@ -1,5 +1,6 @@
 import log from "@/next/log";
 import { ensure } from "@/utils/ensure";
+import { nullToUndefined } from "@/utils/transform";
 import { apiOrigin } from "@ente/shared/network/api";
 import { getToken } from "@ente/shared/storage/localStorage/helpers";
 import { z } from "zod";
@@ -13,8 +14,25 @@ let _haveFetched = false;
  *
  * It fetches only once per session, and so is safe to call as arbitrarily many
  * times. Remember to call {@link clearFeatureFlagSessionState} on logout to
- * forget that we've already fetched so that these can be fetched again on the
+ * clear any in memory state so that these can be fetched again on the
  * subsequent login.
+ *
+ * [Note: Feature Flags]
+ *
+ * The workflow with feature flags is:
+ *
+ * 1. On app start feature flags are fetched once and saved in local storage. If
+ *    this fetch fails, we try again periodically (on every "sync") until
+ *    success.
+ *
+ * 2. Attempts to access any individual feature flage (e.g.
+ *    {@link isInternalUser}) returns the corresponding value from local storage
+ *    (substituting a default if needed).
+ *
+ * 3. However, if perchance the fetch-on-app-start hasn't completed yet (or had
+ *    failed), then a new fetch is tried. If even this fetch fails, we return
+ *    the default. Otherwise the now fetched result is saved to local storage
+ *    and the corresponding value returned.
  */
 export const fetchAndSaveFeatureFlagsIfNeeded = () => {
     if (_haveFetched) return;
@@ -62,31 +80,25 @@ const saveFlagJSONString = (s: string) =>
 const remoteFeatureFlags = () => {
     const s = localStorage.getItem("remoteFeatureFlags");
     if (!s) return undefined;
-    return JSON.parse(s);
+    return FeatureFlags.parse(s);
 };
 
 const FeatureFlags = z.object({
-    internalUser: z
-        .boolean()
-        .nullish()
-        .transform((v) => (v === null ? undefined : v)),
-    betaUser: z
-        .boolean()
-        .nullish()
-        .transform((v) => (v === null ? undefined : v)),
+    internalUser: z.boolean().nullish().transform(nullToUndefined),
+    betaUser: z.boolean().nullish().transform(nullToUndefined),
 });
 
-type FeatureFlags = 
+type FeatureFlags = z.infer<typeof FeatureFlags>;
 
 const remoteFeatureFlagsFetchingIfNeeded = async () => {
-    let ff = await remoteFeatureFlags();
+    let ff = remoteFeatureFlags();
     if (!ff) {
         try {
             await fetchAndSaveFeatureFlags();
-            ff = await remoteFeatureFlags();
         } catch (e) {
             log.warn("Ignoring error when fetching feature flags", e);
         }
+        ff = remoteFeatureFlags();
     }
     return ff;
 };
@@ -95,17 +107,8 @@ const remoteFeatureFlagsFetchingIfNeeded = async () => {
  * Return `true` if the current user is marked as an "internal" user.
  */
 export const isInternalUser = async () => {
-    // TODO: Dedup
     const flags = await remoteFeatureFlagsFetchingIfNeeded();
-    // TODO(MR): Use Yup here
-    if (
-        flags &&
-        typeof flags === "object" &&
-        "internalUser" in flags &&
-        typeof flags.internalUser == "boolean"
-    )
-        return flags.internalUser;
-    return false;
+    return flags?.internalUser ?? false;
 };
 
 /**
@@ -113,13 +116,5 @@ export const isInternalUser = async () => {
  */
 export const isBetaUser = async () => {
     const flags = await remoteFeatureFlagsFetchingIfNeeded();
-    // TODO(MR): Use Yup here
-    if (
-        flags &&
-        typeof flags === "object" &&
-        "betaUser" in flags &&
-        typeof flags.betaUser == "boolean"
-    )
-        return flags.betaUser;
-    return false;
+    return flags?.betaUser ?? false;
 };
diff --git a/web/packages/utils/transform.ts b/web/packages/utils/transform.ts
new file mode 100644
index 0000000000..0d400619a4
--- /dev/null
+++ b/web/packages/utils/transform.ts
@@ -0,0 +1,3 @@
+/** Convert `null` to `undefined`, passthrough everything else unchanged. */
+export const nullToUndefined = <T>(v: T | null | undefined): T | undefined =>
+    v === null ? undefined : v;
diff --git a/web/yarn.lock b/web/yarn.lock
index eaf097a431..a87928bacf 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -3355,7 +3355,7 @@ libsodium-wrappers@0.7.9:
   dependencies:
     libsodium "^0.7.0"
 
-libsodium@^0.7.0:
+libsodium@0.7.9, libsodium@^0.7.0:
   version "0.7.9"
   resolved "https://registry.yarnpkg.com/libsodium/-/libsodium-0.7.9.tgz#4bb7bcbf662ddd920d8795c227ae25bbbfa3821b"
   integrity sha512-gfeADtR4D/CM0oRUviKBViMGXZDgnFdMKMzHsvBdqLBHd9ySi6EtYnmuhHVDDYgYpAO8eU8hEY+F8vIUAPh08A==
@@ -4992,7 +4992,7 @@ yup@^1.4:
     toposort "^2.0.2"
     type-fest "^2.19.0"
 
-zod@^3.23.8:
+zod@^3:
   version "3.23.8"
   resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
   integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==

From d924ee636d0fe54243d40616ae12e04a3fe420a3 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 16:55:47 +0530
Subject: [PATCH 30/42] Fix imports

---
 web/apps/photos/src/pages/gallery/index.tsx | 2 +-
 web/apps/photos/src/services/logout.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/apps/photos/src/pages/gallery/index.tsx b/web/apps/photos/src/pages/gallery/index.tsx
index a1cba432c1..130c66141b 100644
--- a/web/apps/photos/src/pages/gallery/index.tsx
+++ b/web/apps/photos/src/pages/gallery/index.tsx
@@ -87,7 +87,7 @@ import {
 import downloadManager from "services/download";
 import { syncCLIPEmbeddings } from "services/embeddingService";
 import { syncEntities } from "services/entityService";
-import { fetchAndSaveFeatureFlagsIfNeeded } from "services/feature-flag";
+import { fetchAndSaveFeatureFlagsIfNeeded } from "@/new/photos/services/feature-flags";
 import { getLocalFiles, syncFiles } from "services/fileService";
 import locationSearchService from "services/locationSearchService";
 import { getLocalTrashedFiles, syncTrash } from "services/trashService";
diff --git a/web/apps/photos/src/services/logout.ts b/web/apps/photos/src/services/logout.ts
index bad5259016..98f1d5fb38 100644
--- a/web/apps/photos/src/services/logout.ts
+++ b/web/apps/photos/src/services/logout.ts
@@ -1,10 +1,10 @@
+import { clearFeatureFlagSessionState } from "@/new/photos/services/feature-flags";
 import log from "@/next/log";
 import { accountLogout } from "@ente/accounts/services/logout";
 import { clipService } from "services/clip-service";
 import DownloadManager from "./download";
 import exportService from "./export";
 import { clearFaceData } from "./face/db";
-import { clearFeatureFlagSessionState } from "./feature-flag";
 import mlWorkManager from "./face/mlWorkManager";
 
 /**

From c9c582cbcc44574c4dd79920b1ec09ca0fbd503f Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 16:57:13 +0530
Subject: [PATCH 31/42] fix

---
 web/packages/new/photos/services/feature-flags.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/packages/new/photos/services/feature-flags.ts b/web/packages/new/photos/services/feature-flags.ts
index 2f01953dbf..ae71343b98 100644
--- a/web/packages/new/photos/services/feature-flags.ts
+++ b/web/packages/new/photos/services/feature-flags.ts
@@ -80,7 +80,7 @@ const saveFlagJSONString = (s: string) =>
 const remoteFeatureFlags = () => {
     const s = localStorage.getItem("remoteFeatureFlags");
     if (!s) return undefined;
-    return FeatureFlags.parse(s);
+    return FeatureFlags.parse(JSON.parse(s));
 };
 
 const FeatureFlags = z.object({

From 7c3a137723bc4da5044b2906838017ec6dc87247 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 17:10:27 +0530
Subject: [PATCH 32/42] staff yup => zod

---
 web/apps/staff/package.json                    | 2 +-
 web/apps/staff/src/services/support-service.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/apps/staff/package.json b/web/apps/staff/package.json
index a4752a1e76..530f7f8243 100644
--- a/web/apps/staff/package.json
+++ b/web/apps/staff/package.json
@@ -11,7 +11,7 @@
     "dependencies": {
         "react": "^18",
         "react-dom": "^18",
-        "yup": "^1.4"
+        "zod": "^3"
     },
     "devDependencies": {
         "@/build-config": "*",
diff --git a/web/apps/staff/src/services/support-service.ts b/web/apps/staff/src/services/support-service.ts
index 0b27260e3f..3e22234e76 100644
--- a/web/apps/staff/src/services/support-service.ts
+++ b/web/apps/staff/src/services/support-service.ts
@@ -1,10 +1,10 @@
-import { object, type InferType } from "yup";
+import { z } from "zod";
 
 const apiOrigin = import.meta.env.VITE_ENTE_ENDPOINT ?? "https://api.ente.io";
 
-const userDetailsSchema = object({});
+const UserDetails = z.object({}).passthrough();
 
-export type UserDetails = InferType<typeof userDetailsSchema>;
+export type UserDetails = z.infer<typeof UserDetails>;
 
 /** Fetch details of the user associated with the given {@link authToken}. */
 export const getUserDetails = async (
@@ -17,5 +17,5 @@ export const getUserDetails = async (
         },
     });
     if (!res.ok) throw new Error(`Failed to fetch ${url}: HTTP ${res.status}`);
-    return await userDetailsSchema.validate(await res.json());
+    return UserDetails.parse(await res.json());
 };

From 0e9a4911b55055ba691609bb511a94ba1d1814d4 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 17:20:39 +0530
Subject: [PATCH 33/42] zod

---
 web/packages/next/local-user.ts            | 30 ++++++++++------------
 web/packages/next/worker/comlink-worker.ts |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/web/packages/next/local-user.ts b/web/packages/next/local-user.ts
index d20bb7781d..2a351a421b 100644
--- a/web/packages/next/local-user.ts
+++ b/web/packages/next/local-user.ts
@@ -1,42 +1,40 @@
 // TODO: This file belongs to the accounts package
-import * as yup from "yup";
+import { z } from "zod";
 
-const localUserSchema = yup.object({
+const LocalUser = z.object({
     /** The user's ID. */
-    id: yup.number().required(),
+    id: z.number(),
     /** The user's email. */
-    email: yup.string().required(),
+    email: z.string(),
     /**
      * The user's (plaintext) auth token.
      *
      * It is used for making API calls on their behalf.
      */
-    token: yup.string().required(),
+    token: z.string(),
 });
 
-/** Locally available data for the logged in user's */
-export type LocalUser = yup.InferType<typeof localUserSchema>;
+/** Locally available data for the logged in user */
+export type LocalUser = z.infer<typeof LocalUser>;
 
 /**
- * Return the logged-in user (if someone is indeed logged in).
+ * Return the logged-in user, if someone is indeed logged in. Otherwise return
+ * `undefined`.
  *
  * The user's data is stored in the browser's localStorage.
  */
-export const localUser = async (): Promise<LocalUser | undefined> => {
+export const localUser = (): LocalUser | undefined => {
     // TODO(MR): duplicate of LS_KEYS.USER
     const s = localStorage.getItem("user");
     if (!s) return undefined;
-    return await localUserSchema.validate(JSON.parse(s), {
-        strict: true,
-    });
+    return LocalUser.parse(JSON.parse(s));
 };
 
 /**
  * A wrapper over {@link localUser} with that throws if no one is logged in.
  */
-export const ensureLocalUser = async (): Promise<LocalUser> => {
-    const user = await localUser();
-    if (!user)
-        throw new Error("Attempting to access user data when not logged in");
+export const ensureLocalUser = (): LocalUser => {
+    const user = localUser();
+    if (!user) throw new Error("Not logged in");
     return user;
 };
diff --git a/web/packages/next/worker/comlink-worker.ts b/web/packages/next/worker/comlink-worker.ts
index b388cd413c..a546409839 100644
--- a/web/packages/next/worker/comlink-worker.ts
+++ b/web/packages/next/worker/comlink-worker.ts
@@ -43,7 +43,7 @@ const workerBridge = {
     // Needed: generally (presumably)
     logToDisk,
     // Needed by ML worker
-    getAuthToken: () => ensureLocalUser().then((user) => user.token),
+    getAuthToken: () => ensureLocalUser().token,
     convertToJPEG: (imageData: Uint8Array) =>
         ensureElectron().convertToJPEG(imageData),
     detectFaces: (input: Float32Array) => ensureElectron().detectFaces(input),

From 62f3e6d47bd3b3f628d5ee69525bfe85df7e1295 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 17:36:17 +0530
Subject: [PATCH 34/42] Consolidate checks

---
 web/apps/photos/src/components/Sidebar/index.tsx | 15 +++++++++++----
 web/apps/photos/src/pages/gallery/index.tsx      |  4 ++--
 web/apps/photos/src/services/face/indexer.ts     |  3 +--
 web/apps/photos/src/utils/user/index.ts          | 14 --------------
 .../new/photos/services/feature-flags.ts         | 16 ++++++++++++++++
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/web/apps/photos/src/components/Sidebar/index.tsx b/web/apps/photos/src/components/Sidebar/index.tsx
index 92a69b1ae1..489536e085 100644
--- a/web/apps/photos/src/components/Sidebar/index.tsx
+++ b/web/apps/photos/src/components/Sidebar/index.tsx
@@ -83,7 +83,6 @@ import {
 } from "utils/billing";
 import { openLink } from "utils/common";
 import { getDownloadAppMessage } from "utils/ui";
-import { isInternalUser } from "utils/user";
 import { isFamilyAdmin, isPartOfFamily } from "utils/user/family";
 import { testUpload } from "../../../tests/upload.test";
 import { MemberSubscriptionManage } from "../MemberSubscriptionManage";
@@ -553,7 +552,7 @@ const UtilitySection: React.FC<UtilitySectionProps> = ({ closeSidebar }) => {
                 onClick={openRecoveryKeyModal}
                 label={t("RECOVERY_KEY")}
             />
-            {isInternalUser() && (
+            {isInternalUserViaEmailCheck() && (
                 <EnteMenuItem
                     onClick={toggleTheme}
                     variant="secondary"
@@ -572,7 +571,7 @@ const UtilitySection: React.FC<UtilitySectionProps> = ({ closeSidebar }) => {
                 label={t("TWO_FACTOR")}
             />
 
-            {isInternalUser() && (
+            {isInternalUserViaEmailCheck() && (
                 <EnteMenuItem
                     variant="secondary"
                     onClick={redirectToAccountsPage}
@@ -768,7 +767,7 @@ const DebugSection: React.FC = () => {
                     {appVersion}
                 </Typography>
             )}
-            {isInternalUser() && (
+            {isInternalUserViaEmailCheck() && (
                 <EnteMenuItem
                     variant="secondary"
                     onClick={testUpload}
@@ -778,3 +777,11 @@ const DebugSection: React.FC = () => {
         </>
     );
 };
+
+// TODO: Legacy synchronous check, use the one for feature-flags.ts instead.
+const isInternalUserViaEmailCheck = () => {
+    const userEmail = getData(LS_KEYS.USER)?.email;
+    if (!userEmail) return false;
+
+    return userEmail.endsWith("@ente.io");
+};
diff --git a/web/apps/photos/src/pages/gallery/index.tsx b/web/apps/photos/src/pages/gallery/index.tsx
index 130c66141b..d63a33c14e 100644
--- a/web/apps/photos/src/pages/gallery/index.tsx
+++ b/web/apps/photos/src/pages/gallery/index.tsx
@@ -1,3 +1,4 @@
+import { fetchAndSaveFeatureFlagsIfNeeded } from "@/new/photos/services/feature-flags";
 import log from "@/next/log";
 import { APPS } from "@ente/shared/apps/constants";
 import { CenteredFlex } from "@ente/shared/components/Container";
@@ -87,7 +88,6 @@ import {
 import downloadManager from "services/download";
 import { syncCLIPEmbeddings } from "services/embeddingService";
 import { syncEntities } from "services/entityService";
-import { fetchAndSaveFeatureFlagsIfNeeded } from "@/new/photos/services/feature-flags";
 import { getLocalFiles, syncFiles } from "services/fileService";
 import locationSearchService from "services/locationSearchService";
 import { getLocalTrashedFiles, syncTrash } from "services/trashService";
@@ -720,7 +720,7 @@ export default function Gallery() {
                 await syncCLIPEmbeddings();
                 // TODO-ML(MR): Disable fetch until we start storing it in the
                 // same place as the local ones.
-                // if (isInternalUserForML()) await syncFaceEmbeddings();
+                // if (isFaceIndexingEnabled()) await syncFaceEmbeddings();
             }
             if (clipService.isPlatformSupported()) {
                 void clipService.scheduleImageEmbeddingExtraction();
diff --git a/web/apps/photos/src/services/face/indexer.ts b/web/apps/photos/src/services/face/indexer.ts
index b49c4dc053..5314a15e0b 100644
--- a/web/apps/photos/src/services/face/indexer.ts
+++ b/web/apps/photos/src/services/face/indexer.ts
@@ -7,7 +7,6 @@ import { ensure } from "@/utils/ensure";
 import type { Remote } from "comlink";
 import { getAllLocalFiles } from "services/fileService";
 import type { EnteFile } from "types/file";
-import { isInternalUserForML } from "utils/user";
 import {
     faceIndex,
     indexableFileIDs,
@@ -202,7 +201,7 @@ export const unidentifiedFaceIDs = async (
  * face search in the UI.
  */
 export const canEnableFaceIndexing = async () =>
-    isInternalUserForML() || (await isInternalUser()) || (await isBetaUser());
+    (await isInternalUser()) || (await isBetaUser());
 
 /**
  * Return true if the user has enabled face indexing in the app's settings.
diff --git a/web/apps/photos/src/utils/user/index.ts b/web/apps/photos/src/utils/user/index.ts
index 0f8ef142fb..adb463b502 100644
--- a/web/apps/photos/src/utils/user/index.ts
+++ b/web/apps/photos/src/utils/user/index.ts
@@ -1,21 +1,7 @@
 import { getData, LS_KEYS } from "@ente/shared/storage/localStorage";
-import type { User } from "@ente/shared/user/types";
 import { UserDetails } from "types/user";
 
 export function getLocalUserDetails(): UserDetails {
     return getData(LS_KEYS.USER_DETAILS)?.value;
 }
 
-export const isInternalUser = () => {
-    const userEmail = getData(LS_KEYS.USER)?.email;
-    if (!userEmail) return false;
-
-    return userEmail.endsWith("@ente.io");
-};
-
-export const isInternalUserForML = () => {
-    const userID = (getData(LS_KEYS.USER) as User)?.id;
-    if (userID == 1 || userID == 2) return true;
-
-    return isInternalUser();
-};
diff --git a/web/packages/new/photos/services/feature-flags.ts b/web/packages/new/photos/services/feature-flags.ts
index ae71343b98..419c6baf26 100644
--- a/web/packages/new/photos/services/feature-flags.ts
+++ b/web/packages/new/photos/services/feature-flags.ts
@@ -1,3 +1,5 @@
+import { isDevBuild } from "@/next/env";
+import { localUser } from "@/next/local-user";
 import log from "@/next/log";
 import { ensure } from "@/utils/ensure";
 import { nullToUndefined } from "@/utils/transform";
@@ -105,14 +107,28 @@ const remoteFeatureFlagsFetchingIfNeeded = async () => {
 
 /**
  * Return `true` if the current user is marked as an "internal" user.
+ *
+ * 1. Everyone is considered as an internal user in dev builds.
+ * 2. Emails that end in `@ente.io` are always considered as internal users.
+ * 3. If the "internalUser" remote feature flag is set, the user is internal.
+ * 4. Otherwise false.
+ *
+ * See also: [Note: Feature Flags].
  */
 export const isInternalUser = async () => {
+    if (isDevBuild) return true;
+
+    const user = localUser();
+    if (user?.email.endsWith("@ente.io")) return true;
+
     const flags = await remoteFeatureFlagsFetchingIfNeeded();
     return flags?.internalUser ?? false;
 };
 
 /**
  * Return `true` if the current user is marked as a "beta" user.
+ *
+ * See also: [Note: Feature Flags].
  */
 export const isBetaUser = async () => {
     const flags = await remoteFeatureFlagsFetchingIfNeeded();

From e8a3b3b29927ee8800cc6c5f89a37846fb929c25 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 17:41:59 +0530
Subject: [PATCH 35/42] lf

---
 web/apps/photos/src/pages/_app.tsx      | 2 +-
 web/apps/photos/src/utils/user/index.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx
index f71e503a27..f3435a690c 100644
--- a/web/apps/photos/src/pages/_app.tsx
+++ b/web/apps/photos/src/pages/_app.tsx
@@ -54,8 +54,8 @@ import {
     isFaceIndexingEnabled,
     setIsFaceIndexingEnabled,
 } from "services/face/indexer";
-import { photosLogout } from "services/logout";
 import mlWorkManager from "services/face/mlWorkManager";
+import { photosLogout } from "services/logout";
 import {
     getFamilyPortalRedirectURL,
     getRoadmapRedirectURL,
diff --git a/web/apps/photos/src/utils/user/index.ts b/web/apps/photos/src/utils/user/index.ts
index adb463b502..7404fb5887 100644
--- a/web/apps/photos/src/utils/user/index.ts
+++ b/web/apps/photos/src/utils/user/index.ts
@@ -4,4 +4,3 @@ import { UserDetails } from "types/user";
 export function getLocalUserDetails(): UserDetails {
     return getData(LS_KEYS.USER_DETAILS)?.value;
 }
-

From 1d5f936ceddc2eb738d7279c9745e53ab78e8d4a Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 17:44:29 +0530
Subject: [PATCH 36/42] Move to lower layer for fixing eslint errors

---
 web/packages/build-config/tsconfig-next.json      | 3 ---
 web/packages/build-config/tsconfig-typecheck.json | 6 +++---
 web/packages/new/tsconfig.json                    | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/web/packages/build-config/tsconfig-next.json b/web/packages/build-config/tsconfig-next.json
index 07d38312dc..f06e08e7f4 100644
--- a/web/packages/build-config/tsconfig-next.json
+++ b/web/packages/build-config/tsconfig-next.json
@@ -2,9 +2,6 @@
     /* A base TSConfig for typechecking our Next.js apps and packages. */
     "extends": "@/build-config/tsconfig-typecheck.json",
     "compilerOptions": {
-        /* Also indicate expectation of a WebWorker runtime */
-        "lib": ["ESnext", "DOM", "DOM.Iterable", "WebWorker"],
-
         /* Next.js insists on adding these. Sigh. */
         "allowJs": true,
         "incremental": true
diff --git a/web/packages/build-config/tsconfig-typecheck.json b/web/packages/build-config/tsconfig-typecheck.json
index 9f3d5fcb4e..22aa4ab67a 100644
--- a/web/packages/build-config/tsconfig-typecheck.json
+++ b/web/packages/build-config/tsconfig-typecheck.json
@@ -10,8 +10,8 @@
          * runtime will have.
          *
          * In our case, we tell it that the code will run in a modern browser,
-         * and will have access to a latest JS (esnext) and the DOM (dom). Our
-         * transpiler (Next.js) will ensure that these things hold.
+         * and will have access to a latest JS ("ESNext") and the DOM ("DOM")
+         * and web workers ("WebWorker").
          *
          * Unlike the other individual library components (say how "esnext"
          * implies "ESNext.*"), "DOM.Iterable" (the ability to iterate over DOM
@@ -21,7 +21,7 @@
          * Note that we don't need to specify the `target` compilerOption, since
          * tsc isn't actually generating (emitting) the JavaScript.
          */
-        "lib": ["ESnext", "DOM", "DOM.Iterable"],
+        "lib": ["ESnext", "DOM", "DOM.Iterable", "WebWorker"],
 
         /*
          * The module system to assume the generated JavaScript will use.
diff --git a/web/packages/new/tsconfig.json b/web/packages/new/tsconfig.json
index d890ecabeb..d30f8c21f3 100644
--- a/web/packages/new/tsconfig.json
+++ b/web/packages/new/tsconfig.json
@@ -1,4 +1,4 @@
 {
     "extends": "@/build-config/tsconfig-typecheck.json",
-    "include": ["."]
+    "include": [".", "../next/global-electron.d.ts"]
 }

From 9deefeb0191b3fce3e3a2d19fde5183861b247fb Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 19:13:53 +0530
Subject: [PATCH 37/42] window-rect

---
 desktop/src/main/stores/user-preferences.ts | 34 ++++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/desktop/src/main/stores/user-preferences.ts b/desktop/src/main/stores/user-preferences.ts
index f3b1929892..e777e538ef 100644
--- a/desktop/src/main/stores/user-preferences.ts
+++ b/desktop/src/main/stores/user-preferences.ts
@@ -4,17 +4,35 @@ interface UserPreferences {
     hideDockIcon?: boolean;
     skipAppVersion?: string;
     muteUpdateNotificationVersion?: string;
+    /**
+     * The last position size of our app's window, saved when the app is closed.
+     *
+     * This value is saved when the app is about to quit, and is used to restore
+     * the window to the previous state when it restarts.
+     *
+     * If the user maximizes the window then this value is cleared and instead
+     * we just re-maximize the window on restart. This is also the behaviour if
+     * no previously saved `windowRect` is found.
+     */
+    windowRect?: {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
 }
 
 const userPreferencesSchema: Schema<UserPreferences> = {
-    hideDockIcon: {
-        type: "boolean",
-    },
-    skipAppVersion: {
-        type: "string",
-    },
-    muteUpdateNotificationVersion: {
-        type: "string",
+    hideDockIcon: { type: "boolean" },
+    skipAppVersion: { type: "string" },
+    muteUpdateNotificationVersion: { type: "string" },
+    windowRect: {
+        properties: {
+            x: { type: "number" },
+            y: { type: "number" },
+            width: { type: "number" },
+            height: { type: "number" },
+        },
     },
 };
 

From d067673dcabc8182540470c39e857215949f8ebf Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 19:15:10 +0530
Subject: [PATCH 38/42] old

---
 desktop/src/main/stores/user-preferences.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/desktop/src/main/stores/user-preferences.ts b/desktop/src/main/stores/user-preferences.ts
index e777e538ef..643c459c34 100644
--- a/desktop/src/main/stores/user-preferences.ts
+++ b/desktop/src/main/stores/user-preferences.ts
@@ -1,6 +1,11 @@
 import Store, { Schema } from "electron-store";
 
 interface UserPreferences {
+    /**
+     * If true, then the user has set a preference to also hide the dock icon on
+     * macOS whenever the app is hidden. The tray icon is always visible and can
+     * then be used to reopen the app when needed.
+     */
     hideDockIcon?: boolean;
     skipAppVersion?: string;
     muteUpdateNotificationVersion?: string;

From b365e03acd86decc63282d916d25a5230aa2f89d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 19:26:26 +0530
Subject: [PATCH 39/42] Use 1

---
 desktop/src/main.ts | 222 ++++++++++++++++++++++++--------------------
 1 file changed, 122 insertions(+), 100 deletions(-)

diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index 8a43b01a30..d733ce69e6 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -143,12 +143,16 @@ const registerPrivilegedSchemes = () => {
  * This window will show the HTML served from {@link rendererURL}.
  */
 const createMainWindow = () => {
+    const rect = windowRect();
+
     // Create the main window. This'll show our web content.
     const window = new BrowserWindow({
         webPreferences: {
             preload: path.join(__dirname, "preload.js"),
             sandbox: true,
         },
+        // Set the window's position and size (if we have one saved).
+        ...(rect ?? {}),
         // The color to show in the window until the web content gets loaded.
         // See: https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
         backgroundColor: "black",
@@ -164,8 +168,10 @@ const createMainWindow = () => {
         // On macOS, also hide the dock icon on macOS.
         if (process.platform == "darwin") app.dock.hide();
     } else {
-        // Show our window (maximizing it) otherwise.
-        window.maximize();
+        // Show our window otherwise.
+        //
+        // If we did not give it an explicit size, maximize it
+        rect ? window.show() : window.maximize();
     }
 
     // Open the DevTools automatically when running in dev mode
@@ -212,107 +218,19 @@ const createMainWindow = () => {
 };
 
 /**
- * Automatically set the save path for user initiated downloads to the system's
- * "downloads" directory instead of asking the user to select a save location.
- */
-export const setDownloadPath = (webContents: WebContents) => {
-    webContents.session.on("will-download", (_, item) => {
-        item.setSavePath(
-            uniqueSavePath(app.getPath("downloads"), item.getFilename()),
-        );
-    });
-};
-
-const uniqueSavePath = (dirPath: string, fileName: string) => {
-    const { name, ext } = path.parse(fileName);
-
-    let savePath = path.join(dirPath, fileName);
-    let n = 1;
-    while (existsSync(savePath)) {
-        const suffixedName = [`${name}(${n})`, ext].filter((x) => x).join(".");
-        savePath = path.join(dirPath, suffixedName);
-        n++;
-    }
-    return savePath;
-};
-
-/**
- * Allow opening external links, e.g. when the user clicks on the "Feature
- * requests" button in the sidebar (to open our GitHub repository), or when they
- * click the "Support" button to send an email to support.
+ * Determine the position and size of our app's main window based on the
+ * position and size of the window the last time around (if any).
  *
- * @param webContents The renderer to configure.
- */
-export const allowExternalLinks = (webContents: WebContents) =>
-    // By default, if the user were open a link, say
-    // https://github.com/ente-io/ente/discussions, then it would open a _new_
-    // BrowserWindow within our app.
-    //
-    // This is not the behaviour we want; what we want is to ask the system to
-    // handle the link (e.g. open the URL in the default browser, or if it is a
-    // mailto: link, then open the user's mail client).
-    //
-    // Returning `action` "deny" accomplishes this.
-    webContents.setWindowOpenHandler(({ url }) => {
-        if (!url.startsWith(rendererURL)) {
-            // This does not work in Ubuntu currently: mailto links seem to just
-            // get ignored, and HTTP links open in the text editor instead of in
-            // the browser.
-            // https://github.com/electron/electron/issues/31485
-            void shell.openExternal(url);
-            return { action: "deny" };
-        } else {
-            return { action: "allow" };
-        }
-    });
-
-/**
- * Allow uploading to arbitrary S3 buckets.
+ * The saved size is compared to the current screen size to ensure we don't do
+ * anything too wonky if say the user's screen size has changed since the last
+ * time our app was running.
  *
- * The files in the desktop app are served over the ente:// protocol. During
- * testing or self-hosting, we might be using a S3 bucket that does not allow
- * whitelisting a custom URI scheme. To avoid requiring the bucket to set an
- * "Access-Control-Allow-Origin: *" or do a echo-back of `Origin`, we add a
- * workaround here instead, intercepting the ACAO header and allowing `*`.
+ * If it doubt (and where there is no previous saved state), return `undefined`.
+ * This should be taken to mean that the app's main window should be maximized.
  */
-export const allowAllCORSOrigins = (webContents: WebContents) =>
-    webContents.session.webRequest.onHeadersReceived(
-        ({ responseHeaders }, callback) => {
-            const headers: NonNullable<typeof responseHeaders> = {};
-            for (const [key, value] of Object.entries(responseHeaders ?? {}))
-                if (key.toLowerCase() != "access-control-allow-origin")
-                    headers[key] = value;
-            headers["Access-Control-Allow-Origin"] = ["*"];
-            callback({ responseHeaders: headers });
-        },
-    );
-
-/**
- * Add an icon for our app in the system tray.
- *
- * For example, these are the small icons that appear on the top right of the
- * screen in the main menu bar on macOS.
- */
-const setupTrayItem = (mainWindow: BrowserWindow) => {
-    // There are a total of 6 files corresponding to this tray icon.
-    //
-    // On macOS, use template images (filename needs to end with "Template.ext")
-    // https://www.electronjs.org/docs/latest/api/native-image#template-image-macos
-    //
-    // And for each (template or otherwise), there are 3 "retina" variants
-    // https://www.electronjs.org/docs/latest/api/native-image#high-resolution-image
-    const iconName =
-        process.platform == "darwin"
-            ? "taskbar-icon-Template.png"
-            : "taskbar-icon.png";
-    const trayImgPath = path.join(
-        isDev ? "build" : process.resourcesPath,
-        iconName,
-    );
-    const trayIcon = nativeImage.createFromPath(trayImgPath);
-    const tray = new Tray(trayIcon);
-    tray.setToolTip("Ente Photos");
-    tray.setContextMenu(createTrayContextMenu(mainWindow));
+const windowRect = () => {
+    return userPreferences.get("windowRect");
+    // return undefined;
 };
 
 /**
@@ -362,6 +280,110 @@ const windowIconOptions = () => {
     return { icon };
 };
 
+/**
+ * Automatically set the save path for user initiated downloads to the system's
+ * "downloads" directory instead of asking the user to select a save location.
+ */
+const setDownloadPath = (webContents: WebContents) => {
+    webContents.session.on("will-download", (_, item) => {
+        item.setSavePath(
+            uniqueSavePath(app.getPath("downloads"), item.getFilename()),
+        );
+    });
+};
+
+const uniqueSavePath = (dirPath: string, fileName: string) => {
+    const { name, ext } = path.parse(fileName);
+
+    let savePath = path.join(dirPath, fileName);
+    let n = 1;
+    while (existsSync(savePath)) {
+        const suffixedName = [`${name}(${n})`, ext].filter((x) => x).join(".");
+        savePath = path.join(dirPath, suffixedName);
+        n++;
+    }
+    return savePath;
+};
+
+/**
+ * Allow opening external links, e.g. when the user clicks on the "Feature
+ * requests" button in the sidebar (to open our GitHub repository), or when they
+ * click the "Support" button to send an email to support.
+ *
+ * @param webContents The renderer to configure.
+ */
+const allowExternalLinks = (webContents: WebContents) =>
+    // By default, if the user were open a link, say
+    // https://github.com/ente-io/ente/discussions, then it would open a _new_
+    // BrowserWindow within our app.
+    //
+    // This is not the behaviour we want; what we want is to ask the system to
+    // handle the link (e.g. open the URL in the default browser, or if it is a
+    // mailto: link, then open the user's mail client).
+    //
+    // Returning `action` "deny" accomplishes this.
+    webContents.setWindowOpenHandler(({ url }) => {
+        if (!url.startsWith(rendererURL)) {
+            // This does not work in Ubuntu currently: mailto links seem to just
+            // get ignored, and HTTP links open in the text editor instead of in
+            // the browser.
+            // https://github.com/electron/electron/issues/31485
+            void shell.openExternal(url);
+            return { action: "deny" };
+        } else {
+            return { action: "allow" };
+        }
+    });
+
+/**
+ * Allow uploading to arbitrary S3 buckets.
+ *
+ * The files in the desktop app are served over the ente:// protocol. During
+ * testing or self-hosting, we might be using a S3 bucket that does not allow
+ * whitelisting a custom URI scheme. To avoid requiring the bucket to set an
+ * "Access-Control-Allow-Origin: *" or do a echo-back of `Origin`, we add a
+ * workaround here instead, intercepting the ACAO header and allowing `*`.
+ */
+const allowAllCORSOrigins = (webContents: WebContents) =>
+    webContents.session.webRequest.onHeadersReceived(
+        ({ responseHeaders }, callback) => {
+            const headers: NonNullable<typeof responseHeaders> = {};
+            for (const [key, value] of Object.entries(responseHeaders ?? {}))
+                if (key.toLowerCase() != "access-control-allow-origin")
+                    headers[key] = value;
+            headers["Access-Control-Allow-Origin"] = ["*"];
+            callback({ responseHeaders: headers });
+        },
+    );
+
+/**
+ * Add an icon for our app in the system tray.
+ *
+ * For example, these are the small icons that appear on the top right of the
+ * screen in the main menu bar on macOS.
+ */
+const setupTrayItem = (mainWindow: BrowserWindow) => {
+    // There are a total of 6 files corresponding to this tray icon.
+    //
+    // On macOS, use template images (filename needs to end with "Template.ext")
+    // https://www.electronjs.org/docs/latest/api/native-image#template-image-macos
+    //
+    // And for each (template or otherwise), there are 3 "retina" variants
+    // https://www.electronjs.org/docs/latest/api/native-image#high-resolution-image
+    const iconName =
+        process.platform == "darwin"
+            ? "taskbar-icon-Template.png"
+            : "taskbar-icon.png";
+    const trayImgPath = path.join(
+        isDev ? "build" : process.resourcesPath,
+        iconName,
+    );
+    const trayIcon = nativeImage.createFromPath(trayImgPath);
+    const tray = new Tray(trayIcon);
+    tray.setToolTip("Ente Photos");
+    tray.setContextMenu(createTrayContextMenu(mainWindow));
+};
+
 /**
  * Older versions of our app used to maintain a cache dir using the main
  * process. This has been removed in favor of cache on the web layer. Delete the

From 19980559f40497748ae17dca0be58b219483050d Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 19:33:15 +0530
Subject: [PATCH 40/42] Use 2

---
 desktop/src/main.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index d733ce69e6..f0f38fbf2d 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -233,6 +233,15 @@ const windowRect = () => {
     // return undefined;
 };
 
+/**
+ * Sibling of {@link windowRect}, see that function's documentation for more
+ * details.
+ */
+const saveWindowRect = (window: BrowserWindow) => {
+    if (window.isMaximized()) userPreferences.delete("windowRect");
+    else userPreferences.set("windowRect", window.getBounds());
+};
+
 /**
  * On Linux the app does not show a dock icon by default, attempt to fix this by
  * returning the path to an icon as the "icon" property that can be passed to
@@ -515,7 +524,10 @@ const main = () => {
     // app, e.g. by clicking on its dock icon.
     app.on("activate", () => mainWindow?.show());
 
-    app.on("before-quit", allowWindowClose);
+    app.on("before-quit", () => {
+        if (mainWindow) saveWindowRect(mainWindow);
+        allowWindowClose();
+    });
 };
 
 main();

From 79d9eba09992898ca6d6483ad187c340ed11a394 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Sun, 2 Jun 2024 19:49:16 +0530
Subject: [PATCH 41/42] Fin

---
 desktop/src/main.ts                         | 53 ++++++++++++---------
 desktop/src/main/stores/user-preferences.ts |  6 +--
 2 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/desktop/src/main.ts b/desktop/src/main.ts
index f0f38fbf2d..5dd8254eb5 100644
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -143,7 +143,7 @@ const registerPrivilegedSchemes = () => {
  * This window will show the HTML served from {@link rendererURL}.
  */
 const createMainWindow = () => {
-    const rect = windowRect();
+    const bounds = windowBounds();
 
     // Create the main window. This'll show our web content.
     const window = new BrowserWindow({
@@ -152,14 +152,16 @@ const createMainWindow = () => {
             sandbox: true,
         },
         // Set the window's position and size (if we have one saved).
-        ...(rect ?? {}),
+        ...(bounds ?? {}),
+        // Enforce a minimum size
+        ...minimumWindowSize(),
+        // (Maybe) fix the dock icon on Linux.
+        ...windowIconOptions(),
         // The color to show in the window until the web content gets loaded.
         // See: https://www.electronjs.org/docs/latest/api/browser-window#setting-the-backgroundcolor-property
         backgroundColor: "black",
         // We'll show it conditionally depending on `wasAutoLaunched` later.
         show: false,
-        // (Maybe) fix the dock icon on Linux.
-        ...windowIconOptions(),
     });
 
     const wasAutoLaunched = autoLauncher.wasAutoLaunched();
@@ -171,7 +173,7 @@ const createMainWindow = () => {
         // Show our window otherwise.
         //
         // If we did not give it an explicit size, maximize it
-        rect ? window.show() : window.maximize();
+        bounds ? window.show() : window.maximize();
     }
 
     // Open the DevTools automatically when running in dev mode
@@ -218,28 +220,35 @@ const createMainWindow = () => {
 };
 
 /**
- * Determine the position and size of our app's main window based on the
- * position and size of the window the last time around (if any).
+ * The position and size of the window the last time it was closed.
  *
- * The saved size is compared to the current screen size to ensure we don't do
- * anything too wonky if say the user's screen size has changed since the last
- * time our app was running.
- *
- * If it doubt (and where there is no previous saved state), return `undefined`.
- * This should be taken to mean that the app's main window should be maximized.
+ * The return value of `undefined` is taken to mean that the app's main window
+ * should be maximized.
  */
-const windowRect = () => {
-    return userPreferences.get("windowRect");
-    // return undefined;
-};
+const windowBounds = () => userPreferences.get("windowBounds");
 
 /**
- * Sibling of {@link windowRect}, see that function's documentation for more
+ * If for some reason {@link windowBounds} is outside the screen's bounds (e.g.
+ * if the user's screen resolution has changed), then the previously saved
+ * bounds might not be appropriate.
+ *
+ * Luckily, if we try to set an x/y position that is outside the screen's
+ * bounds, then Electron automatically clamps them to the screen's available
+ * space, and we do not need to tackle it specifically.
+ *
+ * However, there is no minimum window size the Electron enforces by default. As
+ * a safety valve, provide an (arbitrary) minimum size so that the user can
+ * resize it back to sanity if something I cannot currently anticipate happens.
+ */
+const minimumWindowSize = () => ({ minWidth: 200, minHeight: 200 });
+
+/**
+ * Sibling of {@link windowBounds}, see that function's documentation for more
  * details.
  */
-const saveWindowRect = (window: BrowserWindow) => {
-    if (window.isMaximized()) userPreferences.delete("windowRect");
-    else userPreferences.set("windowRect", window.getBounds());
+const saveWindowBounds = (window: BrowserWindow) => {
+    if (window.isMaximized()) userPreferences.delete("windowBounds");
+    else userPreferences.set("windowBounds", window.getBounds());
 };
 
 /**
@@ -525,7 +534,7 @@ const main = () => {
     app.on("activate", () => mainWindow?.show());
 
     app.on("before-quit", () => {
-        if (mainWindow) saveWindowRect(mainWindow);
+        if (mainWindow) saveWindowBounds(mainWindow);
         allowWindowClose();
     });
 };
diff --git a/desktop/src/main/stores/user-preferences.ts b/desktop/src/main/stores/user-preferences.ts
index 643c459c34..457556ce59 100644
--- a/desktop/src/main/stores/user-preferences.ts
+++ b/desktop/src/main/stores/user-preferences.ts
@@ -10,7 +10,7 @@ interface UserPreferences {
     skipAppVersion?: string;
     muteUpdateNotificationVersion?: string;
     /**
-     * The last position size of our app's window, saved when the app is closed.
+     * The last position and size of our app's window.
      *
      * This value is saved when the app is about to quit, and is used to restore
      * the window to the previous state when it restarts.
@@ -19,7 +19,7 @@ interface UserPreferences {
      * we just re-maximize the window on restart. This is also the behaviour if
      * no previously saved `windowRect` is found.
      */
-    windowRect?: {
+    windowBounds?: {
         x: number;
         y: number;
         width: number;
@@ -31,7 +31,7 @@ const userPreferencesSchema: Schema<UserPreferences> = {
     hideDockIcon: { type: "boolean" },
     skipAppVersion: { type: "string" },
     muteUpdateNotificationVersion: { type: "string" },
-    windowRect: {
+    windowBounds: {
         properties: {
             x: { type: "number" },
             y: { type: "number" },

From 247db36c3bdf9141cc8e99727e7982344fadd591 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 3 Jun 2024 10:18:58 +0530
Subject: [PATCH 42/42] Add changelog entry

---
 desktop/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index 094145d261..b6dccf60e5 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.7.1 (Unreleased)
+
+-   Remember the window size across app restarts.
+
 ## v1.7.0
 
 v1.7 is a major rewrite to improve the security of our app. In particular, the