LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-26 06:11:15 +00:00
Code Issues Projects Releases Wiki Activity

Attempting to fix SSR. #2243 (#2247)

Browse source 
Co-authored-by: SleeplessOne1917 <insomnia_void@protonmail.com>
This commit is contained in:
Dessalines 2023-11-28 21:37:56 -05:00 committed by GitHub
parent 48ed65639a
commit 5ec9baa5a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -53,7 +53,6 @@
"clean-webpack-plugin": "^4.0.0", "clean-webpack-plugin": "^4.0.0",
"cookie": "^0.6.0", "cookie": "^0.6.0",
"copy-webpack-plugin": "^11.0.0", "copy-webpack-plugin": "^11.0.0",
"cross-fetch": "^4.0.0",
"css-loader": "^6.7.3", "css-loader": "^6.7.3",
"date-fns": "^2.30.0", "date-fns": "^2.30.0",
"emoji-mart": "^5.4.0", "emoji-mart": "^5.4.0",

6
src/server/handlers/catch-all-handler.tsx
View file

@ -2,7 +2,6 @@ import { initializeSite, isAuthPath } from "@utils/app";
import { getHttpBaseInternal } from "@utils/env"; import { getHttpBaseInternal } from "@utils/env";
import { ErrorPageData } from "@utils/types"; import { ErrorPageData } from "@utils/types";
import * as cookie from "cookie"; import * as cookie from "cookie";
import fetch from "cross-fetch";
import type { Request, Response } from "express"; import type { Request, Response } from "express";
import { StaticRouter, matchPath } from "inferno-router"; import { StaticRouter, matchPath } from "inferno-router";
import { renderToString } from "inferno-server"; import { renderToString } from "inferno-server";
@ -29,7 +28,7 @@ export default async (req: Request, res: Response) => {
const headers = setForwardedHeaders(req.headers); const headers = setForwardedHeaders(req.headers);
const client = wrapClient( const client = wrapClient(
new LemmyHttp(getHttpBaseInternal(), { fetchFunction: fetch, headers }), new LemmyHttp(getHttpBaseInternal(), { headers }),
); );
const auth = req.headers.cookie const auth = req.headers.cookie
@ -37,7 +36,8 @@ export default async (req: Request, res: Response) => {
: undefined; : undefined;
if (auth) { if (auth) {
client.setHeaders({ Authorization: `Bearer ${auth}` }); headers["Authorization"] = `Bearer ${auth}`;
client.setHeaders(headers);
} }
const { path, url, query } = req; const { path, url, query } = req;

3
src/server/handlers/manifest-handler.ts
View file

@ -1,5 +1,4 @@
import { getHttpBaseExternal, getHttpBaseInternal } from "@utils/env"; import { getHttpBaseExternal, getHttpBaseInternal } from "@utils/env";
import fetch from "cross-fetch";
import type { Request, Response } from "express"; import type { Request, Response } from "express";
import { LemmyHttp } from "lemmy-js-client"; import { LemmyHttp } from "lemmy-js-client";
import { wrapClient } from "../../shared/services/HttpService"; import { wrapClient } from "../../shared/services/HttpService";
@ -13,7 +12,7 @@ export default async (req: Request, res: Response) => {
if (!manifest || manifest.start_url !== getHttpBaseExternal()) { if (!manifest || manifest.start_url !== getHttpBaseExternal()) {
const headers = setForwardedHeaders(req.headers); const headers = setForwardedHeaders(req.headers);
const client = wrapClient( const client = wrapClient(
new LemmyHttp(getHttpBaseInternal(), { fetchFunction: fetch, headers }), new LemmyHttp(getHttpBaseInternal(), { headers }),
); );
const site = await client.getSite(); const site = await client.getSite();

2
src/server/utils/fetch-icon-png.ts
View file

@ -1,5 +1,3 @@
import fetch from "cross-fetch";
export async function fetchIconPng(iconUrl: string) { export async function fetchIconPng(iconUrl: string) {
return await fetch(iconUrl) return await fetch(iconUrl)
.then(res => res.blob()) .then(res => res.blob())

7
yarn.lock
View file

@ -2985,13 +2985,6 @@ cross-fetch@^3.1.5:
dependencies: dependencies:
node-fetch "^2.6.12" node-fetch "^2.6.12"
cross-fetch@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-4.0.0.tgz#f037aef1580bb3a1a35164ea2a848ba81b445983"
integrity sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==
dependencies:
node-fetch "^2.6.12"
cross-spawn@^5.0.1: cross-spawn@^5.0.1:
version "5.1.0" version "5.1.0"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"