From a68537cb3012bb8c184e5c278e4bf3795b064a07 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Thu, 29 Jul 2021 14:54:41 +0800
Subject: [PATCH] ui: fix utils import

---
 packages/ui-default/backendlib/template.js  |  2 --
 packages/ui-default/build/config/webpack.js | 17 ++++++++++++++++-
 packages/ui-default/package.json            |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/packages/ui-default/backendlib/template.js b/packages/ui-default/backendlib/template.js
index 7ae3cbaa2..29c024cfb 100644
--- a/packages/ui-default/backendlib/template.js
+++ b/packages/ui-default/backendlib/template.js
@@ -1,6 +1,4 @@
 const fs = require('fs');
-const esbuild = require('esbuild');
-const { renderToString } = require('react-dom/server');
 const path = require('path');
 const yaml = require('js-yaml');
 const serialize = require('serialize-javascript');
diff --git a/packages/ui-default/build/config/webpack.js b/packages/ui-default/build/config/webpack.js
index bf26621eb..8d588967b 100644
--- a/packages/ui-default/build/config/webpack.js
+++ b/packages/ui-default/build/config/webpack.js
@@ -30,6 +30,16 @@ export default function (env = {}) {
     };
   }
 
+  function esbuildLoader() {
+    return {
+      loader: 'esbuild-loader',
+      options: {
+        loader: 'tsx',
+        target: 'es2015',
+      },
+    };
+  }
+
   function cssLoader() {
     return {
       loader: 'css-loader',
@@ -89,7 +99,7 @@ export default function (env = {}) {
     },
     resolve: {
       modules: [root('node_modules'), root('../../node_modules')],
-      extensions: ['.js', '.jsx'],
+      extensions: ['.js', '.jsx', '.ts', '.tsx'],
       alias: {
         vj: root(),
         'js-yaml': root('utils/yamlCompact'),
@@ -107,6 +117,11 @@ export default function (env = {}) {
           exclude: /node_modules[/\\]/,
           use: [babelLoader()],
         },
+        {
+          test: /\.tsx?$/,
+          exclude: /node_modules[/\\]/,
+          use: [esbuildLoader()],
+        },
         {
           test: /\.styl$/,
           use: [extractCssLoader(), cssLoader(), postcssLoader(), 'stylus-loader'],
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index 0baa453bc..9896f9615 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -114,6 +114,7 @@
   },
   "dependencies": {
     "esbuild": "^0.12.16",
+    "esbuild-loader": "^2.13.1",
     "js-yaml": "^4.1.0",
     "jsesc": "^3.0.2",
     "katex": "^0.13.13",