mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-12-22 19:01:26 +00:00
Merge branch 'main' into 1078-language-select-disable-warning
This commit is contained in:
commit
2c9fd462b2
2 changed files with 6 additions and 6 deletions
|
@ -9,6 +9,7 @@ import IsomorphicCookie from "isomorphic-cookie";
|
|||
import { GetSite, GetSiteResponse, LemmyHttp, Site } from "lemmy-js-client";
|
||||
import path from "path";
|
||||
import process from "process";
|
||||
import sanitize from "sanitize-html";
|
||||
import serialize from "serialize-javascript";
|
||||
import sharp from "sharp";
|
||||
import { App } from "../shared/components/app/app";
|
||||
|
@ -25,7 +26,6 @@ import {
|
|||
favIconUrl,
|
||||
initializeSite,
|
||||
isAuthPath,
|
||||
md,
|
||||
} from "../shared/utils";
|
||||
|
||||
const server = express();
|
||||
|
@ -348,9 +348,7 @@ async function createSsrHtml(root: string, isoData: IsoDataOptionalSite) {
|
|||
<!DOCTYPE html>
|
||||
<html ${helmet.htmlAttributes.toString()} lang="en">
|
||||
<head>
|
||||
<script>window.isoData = ${md.utils.escapeHtml(
|
||||
JSON.stringify(isoData)
|
||||
)}</script>
|
||||
<script>window.isoData = ${sanitize(JSON.stringify(isoData))}</script>
|
||||
<script>window.lemmyConfig = ${serialize(config)}</script>
|
||||
|
||||
<!-- A remote debugging utility for mobile -->
|
||||
|
|
|
@ -206,11 +206,13 @@ export function hotRank(score: number, timeStr: string): number {
|
|||
}
|
||||
|
||||
export function mdToHtml(text: string) {
|
||||
return { __html: md.render(text) };
|
||||
// restore '>' character to fix quotes
|
||||
return { __html: md.render(text.split(">").join(">")) };
|
||||
}
|
||||
|
||||
export function mdToHtmlNoImages(text: string) {
|
||||
return { __html: mdNoImages.render(text) };
|
||||
// restore '>' character to fix quotes
|
||||
return { __html: mdNoImages.render(text.split(">").join(">")) };
|
||||
}
|
||||
|
||||
export function mdToHtmlInline(text: string) {
|
||||
|
|
Loading…
Reference in a new issue