From 83126b8612aaf10c70a00a5d5cfff545e158bcdd Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Mon, 31 Oct 2022 20:43:43 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7mini-star=E5=88=B02.?= =?UTF-8?q?0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/web/package.json | 2 +- client/web/src/plugin/manager.ts | 1 + .../routes/Main/Content/Personal/Sidebar.tsx | 2 +- .../routes/Main/Content/Personal/index.tsx | 1 - pnpm-lock.yaml | 29 +++++++++++++++++-- website/docs/deployment/docker-compose.md | 3 +- 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/client/web/package.json b/client/web/package.json index f73b54d4..a23ce644 100644 --- a/client/web/package.json +++ b/client/web/package.json @@ -38,7 +38,7 @@ "jwt-decode": "^3.1.2", "lodash": "^4.17.21", "memoize-one": "^6.0.0", - "mini-star": "^1.3.1", + "mini-star": "^2.0.2", "minimatch": "^5.1.0", "p-min-delay": "^4.0.0", "qs": "^6.10.3", diff --git a/client/web/src/plugin/manager.ts b/client/web/src/plugin/manager.ts index 5da6c2b7..b4d54c66 100644 --- a/client/web/src/plugin/manager.ts +++ b/client/web/src/plugin/manager.ts @@ -31,6 +31,7 @@ class PluginManager { const loadErrorPlugins = new Set(); await initMiniStar({ plugins, + // removeScriptDomOnLoaded: false, // for test onPluginLoadError: (err) => { console.error('Plugin load error:', err); loadErrorPlugins.add(err.pluginName); diff --git a/client/web/src/routes/Main/Content/Personal/Sidebar.tsx b/client/web/src/routes/Main/Content/Personal/Sidebar.tsx index 61a02709..d6ceff2b 100644 --- a/client/web/src/routes/Main/Content/Personal/Sidebar.tsx +++ b/client/web/src/routes/Main/Content/Personal/Sidebar.tsx @@ -1,5 +1,5 @@ import React, { PropsWithChildren } from 'react'; -import { Icon } from '@/components/Icon'; +import { Icon } from 'tailchat-design'; import { SidebarItem } from '../SidebarItem'; import { t, useDMConverseList, useUserInfo } from 'tailchat-shared'; import { SidebarDMItem } from './SidebarDMItem'; diff --git a/client/web/src/routes/Main/Content/Personal/index.tsx b/client/web/src/routes/Main/Content/Personal/index.tsx index 6c473d7a..fba07a53 100644 --- a/client/web/src/routes/Main/Content/Personal/index.tsx +++ b/client/web/src/routes/Main/Content/Personal/index.tsx @@ -1,4 +1,3 @@ -import { ErrorBoundary } from '@/components/ErrorBoundary'; import { pluginCustomPanel } from '@/plugin/common'; import React from 'react'; import { Navigate, Route, Routes } from 'react-router-dom'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5440d834..fab28437 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -377,7 +377,7 @@ importers: lodash: ^4.17.21 memoize-one: ^6.0.0 mini-css-extract-plugin: ^1.6.2 - mini-star: ^1.3.1 + mini-star: ^2.0.2 minimatch: ^5.1.0 normalize-path: ^3.0.0 p-min-delay: ^4.0.0 @@ -443,7 +443,7 @@ importers: jwt-decode: 3.1.2 lodash: 4.17.21 memoize-one: 6.0.0 - mini-star: 1.3.1 + mini-star: 2.0.2 minimatch: 5.1.0 p-min-delay: 4.0.1 qs: 6.11.0 @@ -1432,7 +1432,7 @@ packages: '@babel/compat-data': 7.18.13 '@babel/core': 7.18.13 '@babel/helper-validator-option': 7.18.6 - browserslist: 4.21.3 + browserslist: 4.21.4 semver: 6.3.0 /@babel/helper-create-class-features-plugin/7.18.13_@babel+core@7.18.13: @@ -21482,6 +21482,29 @@ packages: yargs: 16.2.0 transitivePeerDependencies: - supports-color + dev: true + + /mini-star/2.0.2: + resolution: {integrity: sha512-oR3GIeYzENrf/Dlpbc+Z3yeK2zDuCw+xQp7oiDnDzB446XajTtEL6G6KCRUwjgsKLl000K+BbNTPwKXSdeWJoA==} + hasBin: true + dependencies: + '@rollup/plugin-commonjs': 19.0.2_rollup@2.78.1 + '@rollup/plugin-json': 4.1.0_rollup@2.78.1 + '@rollup/plugin-node-resolve': 13.3.0_rollup@2.78.1 + '@rollup/plugin-url': 6.1.0_rollup@2.78.1 + cosmiconfig: 7.0.1 + esbuild: 0.12.29 + fs-extra: 9.1.0 + inquirer: 8.2.4 + ora: 5.4.1 + rimraf: 3.0.2 + rollup: 2.78.1 + rollup-plugin-esbuild: 4.10.1_ax473fqd6eskvxt55eom7ftbja + rollup-plugin-styles: 3.14.1_rollup@2.78.1 + yargs: 16.2.0 + transitivePeerDependencies: + - supports-color + dev: false /minimalistic-assert/1.0.1: resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==} diff --git a/website/docs/deployment/docker-compose.md b/website/docs/deployment/docker-compose.md index bc9ee804..5b91b16c 100644 --- a/website/docs/deployment/docker-compose.md +++ b/website/docs/deployment/docker-compose.md @@ -9,8 +9,7 @@ title: Docker Compose 部署 > 如果只有 **1核1G**? 请参阅我的博客: [Linux 小资源服务器使用经验总结](http://moonrailgun.com/posts/6769ba51/) 通过交换内存来拓展内存空间 > -> 可供参考的内存用量 -> +> 可供参考的内存用量: > ![](/img/misc/memory-usage.png) ## 前置环境