From 3f6af3b1fb4479fd0d102d1ac3e4b97e33c88940 Mon Sep 17 00:00:00 2001 From: williamhliu Date: Tue, 20 Jun 2023 15:03:48 +0800 Subject: [PATCH] [improvement](webapp) change rollup terser package --- webapp/packages/chat-sdk/package.json | 6 +++--- webapp/packages/chat-sdk/rollup/rollup.esm.config.mjs | 6 +----- webapp/packages/chat-sdk/rollup/rollup.umd.config.mjs | 2 +- webapp/packages/supersonic-fe/package.json | 4 ++-- webapp/packages/supersonic-fe/src/app.tsx | 4 ---- webapp/packages/supersonic-fe/src/pages/Chat/index.tsx | 8 +++++++- webapp/packages/supersonic-fe/src/pages/Login/index.tsx | 2 -- 7 files changed, 14 insertions(+), 18 deletions(-) diff --git a/webapp/packages/chat-sdk/package.json b/webapp/packages/chat-sdk/package.json index 02f763669..a7a6130c9 100644 --- a/webapp/packages/chat-sdk/package.json +++ b/webapp/packages/chat-sdk/package.json @@ -1,6 +1,6 @@ { "name": "supersonic-chat-sdk", - "version": "0.1.6", + "version": "0.1.0", "main": "dist/index.es.js", "module": "dist/index.es.js", "unpkg": "dist/index.umd.js", @@ -63,6 +63,7 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-replace": "^5.0.2", + "@rollup/plugin-terser": "^0.4.3", "@svgr/webpack": "^5.5.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", @@ -117,7 +118,6 @@ "rollup-plugin-exclude-dependencies-from-bundle": "^1.1.23", "rollup-plugin-less": "^1.1.3", "rollup-plugin-postcss": "^4.0.2", - "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.34.1", "sass-loader": "^12.3.0", "semver": "^7.3.5", @@ -191,4 +191,4 @@ "engines": { "node": ">=14.18.0" } -} \ No newline at end of file +} diff --git a/webapp/packages/chat-sdk/rollup/rollup.esm.config.mjs b/webapp/packages/chat-sdk/rollup/rollup.esm.config.mjs index 7c4fb53fd..7d1fd43f5 100644 --- a/webapp/packages/chat-sdk/rollup/rollup.esm.config.mjs +++ b/webapp/packages/chat-sdk/rollup/rollup.esm.config.mjs @@ -1,5 +1,4 @@ import basicConfig from './rollup.config.mjs' -// import { terser } from "rollup-plugin-terser" import excludeDependenciesFromBundle from "rollup-plugin-exclude-dependencies-from-bundle" const config = { @@ -7,10 +6,7 @@ const config = { output: [ { file: 'dist/index.es.js', - format: 'es', - // plugins: [ - // terser() - // ], + format: 'es', }, ], plugins: [ diff --git a/webapp/packages/chat-sdk/rollup/rollup.umd.config.mjs b/webapp/packages/chat-sdk/rollup/rollup.umd.config.mjs index 59f560318..7388d65ac 100644 --- a/webapp/packages/chat-sdk/rollup/rollup.umd.config.mjs +++ b/webapp/packages/chat-sdk/rollup/rollup.umd.config.mjs @@ -1,5 +1,5 @@ import basicConfig from './rollup.config.mjs' -import { terser } from "rollup-plugin-terser" +import terser from '@rollup/plugin-terser'; import replace from '@rollup/plugin-replace' const config = { diff --git a/webapp/packages/supersonic-fe/package.json b/webapp/packages/supersonic-fe/package.json index f1c12e47c..e98deae10 100644 --- a/webapp/packages/supersonic-fe/package.json +++ b/webapp/packages/supersonic-fe/package.json @@ -64,7 +64,7 @@ "@antv/layout": "^0.3.20", "@antv/xflow": "^1.0.55", "@babel/runtime": "^7.22.5", - "supersonic-chat-sdk": "^0.1.6", + "supersonic-chat-sdk": "^0.1.0", "@types/numeral": "^2.0.2", "@types/react-draft-wysiwyg": "^1.13.2", "@types/react-syntax-highlighter": "^13.5.0", @@ -137,7 +137,7 @@ "typescript": "^4.0.3" }, "engines": { - "node": ">=10.0.0" + "node": ">=10.0.0 <17.0.0" }, "resolutions": { "@types/react": "17.0.0" diff --git a/webapp/packages/supersonic-fe/src/app.tsx b/webapp/packages/supersonic-fe/src/app.tsx index ad1b07970..74bd1632f 100644 --- a/webapp/packages/supersonic-fe/src/app.tsx +++ b/webapp/packages/supersonic-fe/src/app.tsx @@ -12,8 +12,6 @@ import defaultSettings from '../config/defaultSettings'; import settings from '../config/themeSettings'; import { deleteUrlQuery } from './utils/utils'; import { AUTH_TOKEN_KEY, FROM_URL_KEY } from '@/common/constants'; -import 'supersonic-chat-sdk/dist/index.css'; -import { setToken as setChatSdkToken } from 'supersonic-chat-sdk'; export { request } from './services/request'; import { ROUTE_AUTH_CODES } from '../config/routes'; @@ -98,8 +96,6 @@ export async function getInitialState(): Promise<{ await getToken(); } - setChatSdkToken(localStorage.getItem(AUTH_TOKEN_KEY) || ''); - const currentUser = await fetchUserInfo(); if (currentUser) { diff --git a/webapp/packages/supersonic-fe/src/pages/Chat/index.tsx b/webapp/packages/supersonic-fe/src/pages/Chat/index.tsx index 070e7b59d..3a58bb1ed 100644 --- a/webapp/packages/supersonic-fe/src/pages/Chat/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Chat/index.tsx @@ -10,9 +10,11 @@ import Conversation from './Conversation'; import RightSection from './RightSection'; import ChatFooter from './ChatFooter'; import classNames from 'classnames'; -import { DEFAULT_CONVERSATION_NAME, WEB_TITLE } from '@/common/constants'; +import { AUTH_TOKEN_KEY, DEFAULT_CONVERSATION_NAME, WEB_TITLE } from '@/common/constants'; import { HistoryMsgItemType, MsgDataType, getHistoryMsg, queryContext } from 'supersonic-chat-sdk'; import { getConversationContext } from './utils'; +import { setToken as setChatSdkToken } from 'supersonic-chat-sdk'; +import 'supersonic-chat-sdk/dist/index.css'; const Chat = () => { const [messageList, setMessageList] = useState([]); @@ -27,6 +29,10 @@ const Chat = () => { const conversationRef = useRef(); const chatFooterRef = useRef(); + useEffect(() => { + setChatSdkToken(localStorage.getItem(AUTH_TOKEN_KEY) || ''); + }, []); + const sendHelloRsp = () => { setMessageList([ { diff --git a/webapp/packages/supersonic-fe/src/pages/Login/index.tsx b/webapp/packages/supersonic-fe/src/pages/Login/index.tsx index b4c05b119..804880a9e 100644 --- a/webapp/packages/supersonic-fe/src/pages/Login/index.tsx +++ b/webapp/packages/supersonic-fe/src/pages/Login/index.tsx @@ -12,7 +12,6 @@ import { postUserLogin, userRegister } from './services'; import { AUTH_TOKEN_KEY } from '@/common/constants'; import { queryCurrentUser } from '@/services/user'; import { history, useModel } from 'umi'; -// import { setToken as setChatSdkToken } from 'supersonic-chat-sdk'; const { Item } = Form; const LoginPage: React.FC = () => { @@ -25,7 +24,6 @@ const LoginPage: React.FC = () => { const { code, data, msg } = await postUserLogin(values); if (code === 200) { localStorage.setItem(AUTH_TOKEN_KEY, data); - // setChatSdkToken(data || ''); const { code: queryUserCode, data: queryUserData } = await queryCurrentUser(); if (queryUserCode === 200) { const currentUser = {