Merge pull request #5381 from reggiezhang/patch-1

Add crossOrigin="use-credentials" for site.webmanifest
2025-11-15 21:43:45 +08:00 · 2024-09-07 16:58:07 +08:00 · 2024-09-07 16:24:52 +08:00 · 2024-09-07 13:01:36 +08:00 · 2024-09-07 13:00:55 +08:00 · 2024-09-07 11:55:23 +08:00
3 changed files with 4 additions and 3 deletions
--- a/app/components/markdown.tsx
+++ b/app/components/markdown.tsx
@@ -163,7 +163,7 @@ export function PreCode(props: { children: any }) {
  );
 }

-function CustomCode(props: { children: any }) {
+function CustomCode(props: { children: any; className?: string }) {
  const ref = useRef<HTMLPreElement>(null);
  const [collapsed, setCollapsed] = useState(true);
  const [showToggle, setShowToggle] = useState(false);
@@ -182,6 +182,7 @@ function CustomCode(props: { children: any }) {
  return (
    <>
      <code
+        className={props?.className}
        ref={ref}
        style={{
          maxHeight: collapsed ? "400px" : "none",
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -41,7 +41,7 @@ export default function RootLayout({
          name="viewport"
          content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
        />
-        <link rel="manifest" href="/site.webmanifest"></link>
+        <link rel="manifest" href="/site.webmanifest" crossOrigin="use-credentials"></link>
        <script src="/serviceWorkerRegister.js" defer></script>
      </head>
      <body>
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -9,7 +9,7 @@
  },
  "package": {
    "productName": "NextChat",
-    "version": "2.14.2"
+    "version": "2.15.0"
  },
  "tauri": {
    "allowlist": {
Author	SHA1	Message	Date
Lloyd Zhou	2ff292cbfa	Merge pull request #5381 from reggiezhang/patch-1 Add crossOrigin="use-credentials" for site.webmanifest	2024-09-07 16:58:07 +08:00
Reggie Zhang	5a81393863	Add crossOrigin="use-credentials" for site.webmanifest Add `crossOrigin="use-credentials"` to the `<link>` element for `site.webmanifest` when the site is behind a proxy with authentication.	2024-09-07 16:24:52 +08:00
Lloyd Zhou	116a73d398	Merge pull request #5377 from ConnectAI-E/hotfix/mermaid hotfix Mermaid can not render. close #5374	2024-09-07 13:01:36 +08:00
lloydzhou	cf0c057164	hotfix Mermaid can not render. close #5374	2024-09-07 13:00:55 +08:00
Lloyd Zhou	fe5a4f4447	Merge pull request #5375 from Kosette/fix-version fix: update package version	2024-09-07 11:55:23 +08:00
kosette	27828d9ca8	fix: update package version	2024-09-06 23:07:01 +08:00