From 446b6f9f25b440eace800d362243480b29f15e1b Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 21 Jun 2023 13:06:32 -0400 Subject: [PATCH] Upgrading lemmy-js-client. --- package.json | 15 ++++----------- src/server/handlers/catch-all-handler.tsx | 4 +++- src/server/handlers/manifest-handler.ts | 4 +++- yarn.lock | 8 ++++---- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index ba05f995..9a285463 100644 --- 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 eb847dc7..025aaa68 100644 --- 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 bdaed3f9..55c7b64f 100644 --- a/src/server/handlers/manifest-handler.ts +++ b/src/server/handlers/manifest-handler.ts @@ -11,7 +11,9 @@ let manifest: Awaited> | 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 8ed82982..f874cb53 100644 --- 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"