Upgrade lemmy-js-client to `0.18.0-rc.2` (#1445)

* Updating translations.

* Upgrading lemmy-js-client.

diff --git a/lemmy-translations b/lemmy-translations
index ddf0d3a4dcfba5eddbcdb702db2470b52abb3815..a241fe1255a6363c7ae1ec5a09520c066745e6ce 160000 (submodule)
--- a/lemmy-translations
+++ b/lemmy-translations
@@ -1 +1 @@
-Subproject commit ddf0d3a4dcfba5eddbcdb702db2470b52abb3815
+Subproject commit a241fe1255a6363c7ae1ec5a09520c066745e6ce

diff --git a/package.json b/package.json
index ba05f99521a58b16f0f2c202ec2ada6962ab1d67..9a285463d74f9f39a89ce27a4c048ebdef2465d7 100644 (file)
--- a/package.json
+++ b/package.json
@@ -22,16 +22,9 @@
     "translations:update": "git submodule update --remote --recursive"
   },
   "lint-staged": {
-    "*.{ts,tsx,js}": [
-      "prettier --write",
-      "eslint --fix"
-    ],
-    "*.{css, scss}": [
-      "prettier --write"
-    ],
-    "package.json": [
-      "sortpack"
-    ]
+    "*.{ts,tsx,js}": ["prettier --write", "eslint --fix"],
+    "*.{css, scss}": ["prettier --write"],
+    "package.json": ["sortpack"]
   },
   "dependencies": {
     "@babel/plugin-proposal-decorators": "^7.21.0",
@@ -66,7 +59,7 @@
     "inferno-server": "^8.1.1",
     "isomorphic-cookie": "^1.2.4",
     "jwt-decode": "^3.1.2",
-    "lemmy-js-client": "0.18.0-rc.1",
+    "lemmy-js-client": "0.18.0-rc.2",
     "lodash": "^4.17.21",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",

diff --git a/src/server/handlers/catch-all-handler.tsx b/src/server/handlers/catch-all-handler.tsx
index eb847dc7a2b6944e37f6278450083ef36e0f72d5..025aaa6833c33451c6c5b03c64049c0e91443c7d 100644 (file)
--- a/src/server/handlers/catch-all-handler.tsx
+++ b/src/server/handlers/catch-all-handler.tsx
@@ -28,7 +28,9 @@ export default async (req: Request, res: Response) => {
     const getSiteForm: GetSite = { auth };
 
     const headers = setForwardedHeaders(req.headers);
-    const client = wrapClient(new LemmyHttp(getHttpBaseInternal(), headers));
+    const client = wrapClient(
+      new LemmyHttp(getHttpBaseInternal(), { fetchFunction: fetch, headers })
+    );
 
     const { path, url, query } = req;
 

diff --git a/src/server/handlers/manifest-handler.ts b/src/server/handlers/manifest-handler.ts
index bdaed3f9d1786dec9ec6b6ef3e96d83059b819b9..55c7b64fead6aa0af2ffabb7a5984c4cc54b8cd0 100644 (file)
--- a/src/server/handlers/manifest-handler.ts
+++ b/src/server/handlers/manifest-handler.ts
@@ -11,7 +11,9 @@ let manifest: Awaited<ReturnType<typeof generateManifestJson>> | undefined =
 export default async (req: Request, res: Response) => {
   if (!manifest) {
     const headers = setForwardedHeaders(req.headers);
-    const client = wrapClient(new LemmyHttp(getHttpBaseInternal(), headers));
+    const client = wrapClient(
+      new LemmyHttp(getHttpBaseInternal(), { fetchFunction: fetch, headers })
+    );
     const site = await client.getSite({});
 
     if (site.state === "success") {

diff --git a/yarn.lock b/yarn.lock
index 8ed829827f2f60e01433554268a5c03568a5684e..f874cb53757fb616e8e0c932a3995e5ca4ead4e6 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -5695,10 +5695,10 @@ leac@^0.6.0:
   resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912"
   integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
 
-lemmy-js-client@0.18.0-rc.1:
-  version "0.18.0-rc.1"
-  resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.18.0-rc.1.tgz#fd0c88810572d90413696011ebaed19e3b8162d8"
-  integrity sha512-lQe443Nr5UCSoY+IxmT7mBe0IRF6EAZ/4PJSRoPSL+U8A+egMMBPbuxnisHzLsC+eDOWRUIgOqZlwlaRnbmuig==
+lemmy-js-client@0.18.0-rc.2:
+  version "0.18.0-rc.2"
+  resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.18.0-rc.2.tgz#6cd8b4dc95de8f2a6f99de56819c141a394dca04"
+  integrity sha512-bnYs89MjlQHwVIr1YIoAvgFkCTWrXDjSgPbCJx8ijrxZXqOKW/KAgWEisfqyFpy3dYpA3/sxFjh7b4sdxM+8VA==
   dependencies:
     cross-fetch "^3.1.5"
     form-data "^4.0.0"