From 0d2d84d114bd29b285b08ebcd658020a54af2c23 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sun, 11 Aug 2024 02:00:19 +0800
Subject: [PATCH] ui: fix tpl

---
 README.md                                          |  2 +-
 packages/ui-default/build/config/webpack.ts        |  2 +-
 packages/ui-default/components/dialog/DomDialog.ts |  5 ++---
 packages/ui-default/entry.js                       |  2 +-
 packages/ui-default/package.json                   |  2 +-
 packages/ui-default/utils/base.ts                  | 14 +++++++-------
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index f25265a42..be2efcb6a 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ Hydro 用户群：1085853538
 <details>
 <summary><h2>更新日志（点击展开）</h2></summary>
 
-### Hydro 4.14.0 / UI 4.53.0
+### Hydro 4.14.0 / UI 4.53.1
 - core: 修复能够越权查看隐藏题目的问题 [security]
 - ui: 优化提交记录详情富文本展示
 - ui: 支持头像缓存
diff --git a/packages/ui-default/build/config/webpack.ts b/packages/ui-default/build/config/webpack.ts
index 2d082c5ae..2efee2ef2 100644
--- a/packages/ui-default/build/config/webpack.ts
+++ b/packages/ui-default/build/config/webpack.ts
@@ -44,7 +44,7 @@ export default async function (env: { watch?: boolean, production?: boolean, mea
       loader: 'esbuild-loader',
       options: {
         loader: 'tsx',
-        target: 'es2015',
+        target: 'es6',
         sourcemap: true,
       },
     };
diff --git a/packages/ui-default/components/dialog/DomDialog.ts b/packages/ui-default/components/dialog/DomDialog.ts
index cc94128d1..2f61085ac 100644
--- a/packages/ui-default/components/dialog/DomDialog.ts
+++ b/packages/ui-default/components/dialog/DomDialog.ts
@@ -109,9 +109,8 @@ export default class DomDialog extends DOMAttachedObject {
   }
 
   show() {
-    if (this.isShown || this.isAnimating) {
-      return Promise.reject();
-    }
+    if (this.isShown) return Promise.reject(new Error('dialog isShown'));
+    if (this.isAnimating) return Promise.reject(new Error('dialog isAnimating'));
     const promise = new Promise<string>((resolve) => {
       this._resolve = resolve;
     });
diff --git a/packages/ui-default/entry.js b/packages/ui-default/entry.js
index d2164eabe..7190822e7 100644
--- a/packages/ui-default/entry.js
+++ b/packages/ui-default/entry.js
@@ -52,7 +52,7 @@ if (process.env.NODE_ENV === 'production' && UiContext.sentry_dsn) {
     if (!e.isUserFacingError) window._sentryEvents.push(e);
   };
   const script = document.createElement('script');
-  script.src = new URL('/sentry.js', __webpack_public_path__).href;
+  script.src = new URL('/sentry.js', UiContext.cdn_prefix).href;
   document.body.appendChild(script);
 }
 
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 13c0a072d..041c61711 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.53.0",
+  "version": "4.53.1",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "index.ts",
diff --git a/packages/ui-default/utils/base.ts b/packages/ui-default/utils/base.ts
index 00ff79f55..f3b9cf62f 100644
--- a/packages/ui-default/utils/base.ts
+++ b/packages/ui-default/utils/base.ts
@@ -2,6 +2,7 @@ import $ from 'jquery';
 import _ from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
+import DOMServer from 'react-dom/server';
 
 export function substitute(str: string, obj: any) {
   return str.replace(/\{([^{}]+)\}/g, (match, key) => {
@@ -37,13 +38,12 @@ export function tpl<T extends boolean = false>(node: React.ReactNode, reactive?:
 export function tpl(pieces: TemplateStringsArray, ...substitutions: Substitution[]): string;
 export function tpl(pieces: TemplateStringsArray | React.ReactNode, ...substitutions: Substitution[] | boolean[]) {
   if (React.isValidElement(pieces)) {
-    const div = document.createElement('div');
-    const root = ReactDOM.createRoot(div);
-    root.render(pieces);
-    if (substitutions[0]) return div;
-    const html = div.innerHTML;
-    root.unmount();
-    return html;
+    if (substitutions[0]) {
+      const div = document.createElement('div');
+      ReactDOM.createRoot(div).render(pieces);
+      return div;
+    }
+    return DOMServer.renderToStaticMarkup(pieces);
   }
   let result = pieces[0];
   for (let i = 0; i < substitutions.length; ++i) {