From d601ce7974f733a13d7b3a47e7c9522898739950 Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:46:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E2=9C=A8=20update=20axios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/builder/package.json | 2 +- apps/builder/src/api/http/base.ts | 9 +++-- .../src/api/http/interceptors/request/auth.ts | 13 ------- .../interceptors/response/errorHandler.ts | 35 ------------------- apps/cloud/package.json | 2 +- apps/cloud/src/api/http/base.ts | 8 +++-- .../src/api/http/interceptors/request/auth.ts | 13 ------- .../interceptors/response/errorHandler.ts | 22 ------------ packages/illa-public-component | 2 +- pnpm-lock.yaml | 31 +++++++++------- 10 files changed, 33 insertions(+), 104 deletions(-) delete mode 100644 apps/builder/src/api/http/interceptors/request/auth.ts delete mode 100644 apps/builder/src/api/http/interceptors/response/errorHandler.ts delete mode 100644 apps/cloud/src/api/http/interceptors/request/auth.ts delete mode 100644 apps/cloud/src/api/http/interceptors/response/errorHandler.ts diff --git a/apps/builder/package.json b/apps/builder/package.json index c4e0d9e6a6..07e6f482cd 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -84,7 +84,7 @@ "@uiw/react-color-sketch": "^1.4.2", "acorn": "^8.7.1", "acorn-walk": "^8.2.0", - "axios": "^0.26.1", + "axios": "^1.6.2", "chart.js": "^3.9.1", "chroma-js": "^2.4.2", "copy-to-clipboard": "^3.3.2", diff --git a/apps/builder/src/api/http/base.ts b/apps/builder/src/api/http/base.ts index 4860199dda..045969eb2f 100644 --- a/apps/builder/src/api/http/base.ts +++ b/apps/builder/src/api/http/base.ts @@ -1,6 +1,9 @@ -import { actionRuntimeAxios, needAuthAxios } from "@illa-public/illa-net/base" -import { authInterceptor } from "@/api/http/interceptors/request/auth" -import { errorHandlerInterceptor } from "@/api/http/interceptors/response/errorHandler" +import { + actionRuntimeAxios, + authInterceptor, + errorHandlerInterceptor, + needAuthAxios, +} from "@illa-public/illa-net" needAuthAxios.interceptors.request.use(authInterceptor) needAuthAxios.interceptors.response.use(undefined, errorHandlerInterceptor) diff --git a/apps/builder/src/api/http/interceptors/request/auth.ts b/apps/builder/src/api/http/interceptors/request/auth.ts deleted file mode 100644 index 1e078aa5c9..0000000000 --- a/apps/builder/src/api/http/interceptors/request/auth.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { getAuthToken } from "@illa-public/utils" -import { AxiosRequestConfig } from "axios" - -export const authInterceptor = (config: AxiosRequestConfig) => { - const token = getAuthToken() - if (typeof token === "string") { - config.headers = { - Authorization: token, - ...(config.headers ?? {}), - } - } - return config -} diff --git a/apps/builder/src/api/http/interceptors/response/errorHandler.ts b/apps/builder/src/api/http/interceptors/response/errorHandler.ts deleted file mode 100644 index 4811d7fd7a..0000000000 --- a/apps/builder/src/api/http/interceptors/response/errorHandler.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { getILLABuilderURL, removeAuthToken } from "@illa-public/utils" -import { AxiosError } from "axios" -import { cloudRedirect } from "@/router/constant" -import { commonBillingErrorHandler } from "@/utils/billing/errorHandler" - -export const errorHandlerInterceptor = (error: AxiosError) => { - const { response } = error - if (!response) return Promise.reject(error) - const { status } = response - switch (status) { - // TODO: @aruseito maybe need custom error status, because of we'll have plugin to request other's api - case 401: { - removeAuthToken() - window.location.href = cloudRedirect - break - } - case 403: { - window.location.href = `${getILLABuilderURL()}/403` - break - } - case 500: { - window.location.href = `${getILLABuilderURL()}/500` - break - } - default: { - if (status >= 500) { - window.location.href = `${getILLABuilderURL()}/500` - break - } - commonBillingErrorHandler(response) - break - } - } - return Promise.reject(error) -} diff --git a/apps/cloud/package.json b/apps/cloud/package.json index bd1570deae..b68ce5c7ac 100644 --- a/apps/cloud/package.json +++ b/apps/cloud/package.json @@ -35,7 +35,7 @@ "@illa-public/user-role-utils": "workspace:*", "@illa-public/utils": "workspace:*", "@reduxjs/toolkit": "^1.9.7", - "axios": "^0.26.1", + "axios": "^1.6.2", "dayjs": "^1.11.10", "fuse.js": "^6.6.2", "i18next": "^23.7.6", diff --git a/apps/cloud/src/api/http/base.ts b/apps/cloud/src/api/http/base.ts index 21fbd07276..9da0d6f658 100644 --- a/apps/cloud/src/api/http/base.ts +++ b/apps/cloud/src/api/http/base.ts @@ -1,6 +1,8 @@ -import { needAuthAxios } from "@illa-public/illa-net" -import { authInterceptor } from "./interceptors/request/auth" -import { errorHandlerInterceptor } from "./interceptors/response/errorHandler" +import { + authInterceptor, + errorHandlerInterceptor, + needAuthAxios, +} from "@illa-public/illa-net" needAuthAxios.interceptors.request.use(authInterceptor) needAuthAxios.interceptors.response.use(undefined, errorHandlerInterceptor) diff --git a/apps/cloud/src/api/http/interceptors/request/auth.ts b/apps/cloud/src/api/http/interceptors/request/auth.ts deleted file mode 100644 index 1e078aa5c9..0000000000 --- a/apps/cloud/src/api/http/interceptors/request/auth.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { getAuthToken } from "@illa-public/utils" -import { AxiosRequestConfig } from "axios" - -export const authInterceptor = (config: AxiosRequestConfig) => { - const token = getAuthToken() - if (typeof token === "string") { - config.headers = { - Authorization: token, - ...(config.headers ?? {}), - } - } - return config -} diff --git a/apps/cloud/src/api/http/interceptors/response/errorHandler.ts b/apps/cloud/src/api/http/interceptors/response/errorHandler.ts deleted file mode 100644 index 008cb9f6ca..0000000000 --- a/apps/cloud/src/api/http/interceptors/response/errorHandler.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { getILLACloudURL, removeAuthToken } from "@illa-public/utils" -import { AxiosError } from "axios" - -export const errorHandlerInterceptor = (error: AxiosError) => { - const { response } = error - if (!response) { - return Promise.reject(error) - } - - const { status } = response - switch (status) { - case 401: { - removeAuthToken() - window.location.href = `${getILLACloudURL()}/login` - break - } - default: { - // throw new Response(message, { status: status }) - } - } - return Promise.reject(error) -} diff --git a/packages/illa-public-component b/packages/illa-public-component index 2bccc6b7a3..d178dc637e 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit 2bccc6b7a3a47b107c643217ba858899de9ded62 +Subproject commit d178dc637e7c4486c4d6360490362c62d535c116 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2137b744c9..8f72d96652 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -289,8 +289,8 @@ importers: specifier: ^8.2.0 version: 8.2.0 axios: - specifier: ^0.26.1 - version: 0.26.1 + specifier: ^1.6.2 + version: 1.6.2 chart.js: specifier: ^3.9.1 version: 3.9.1 @@ -617,8 +617,8 @@ importers: specifier: ^1.9.7 version: 1.9.7(react-redux@8.1.3)(react@18.2.0) axios: - specifier: ^0.26.1 - version: 0.26.1 + specifier: ^1.6.2 + version: 1.6.2 dayjs: specifier: ^1.11.10 version: 1.11.10 @@ -2971,8 +2971,8 @@ importers: specifier: workspace:* version: link:../utils axios: - specifier: ^0.26.1 - version: 0.26.1 + specifier: ^1.6.2 + version: 1.6.2 devDependencies: tsconfig: specifier: workspace:* @@ -8332,7 +8332,6 @@ packages: /asynckit@0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - dev: true /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} @@ -8350,10 +8349,12 @@ packages: resolution: {integrity: sha512-/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg==} engines: {node: '>=4'} - /axios@0.26.1: - resolution: {integrity: sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==} + /axios@1.6.2: + resolution: {integrity: sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==} dependencies: follow-redirects: 1.15.2 + form-data: 4.0.0 + proxy-from-env: 1.1.0 transitivePeerDependencies: - debug dev: false @@ -8835,7 +8836,6 @@ packages: engines: {node: '>= 0.8'} dependencies: delayed-stream: 1.0.0 - dev: true /comma-separated-tokens@1.0.8: resolution: {integrity: sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==} @@ -9342,7 +9342,6 @@ packages: /delayed-stream@1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} - dev: true /dequal@2.0.3: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} @@ -10582,6 +10581,15 @@ packages: mime-types: 2.1.35 dev: true + /form-data@4.0.0: + resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} + engines: {node: '>= 6'} + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.8 + mime-types: 2.1.35 + dev: false + /format@0.2.2: resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==} engines: {node: '>=0.4.x'} @@ -14231,7 +14239,6 @@ packages: /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: true /prr@1.0.1: resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} From 260b317efcccd603efbdda1fa4f39a4c632a8f80 Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:41:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E2=AC=86=EF=B8=8F=20upgrade=20redu?= =?UTF-8?q?x=20&=20redux-toolkit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/builder/package.json | 6 +- .../src/middleware/guideAsync/index.ts | 5 +- .../src/middleware/mixpanelReport/index.ts | 5 +- .../src/middleware/reduxAsync/index.ts | 7 +- apps/builder/src/middleware/undoRedo/index.ts | 7 +- .../PageNavBar/ShareAppButton/index.tsx | 2 +- .../redux/currentApp/appInfo/appInfoSlice.ts | 8 +- apps/builder/src/store.ts | 5 - apps/cloud/package.json | 4 +- packages/illa-public-component | 2 +- pnpm-lock.yaml | 132 +++++++----------- 11 files changed, 75 insertions(+), 108 deletions(-) diff --git a/apps/builder/package.json b/apps/builder/package.json index 07e6f482cd..dab39a5412 100644 --- a/apps/builder/package.json +++ b/apps/builder/package.json @@ -71,7 +71,7 @@ "@mui/x-data-grid-premium": "^6.18.2", "@protobuf-ts/runtime": "^2.8.3", "@react-google-maps/api": "^2.18.1", - "@reduxjs/toolkit": "^1.9.7", + "@reduxjs/toolkit": "^2.0.1", "@rjsf/core": "^5.10.0", "@rjsf/utils": "^5.10.0", "@rjsf/validator-ajv8": "^5.10.0", @@ -120,7 +120,7 @@ "react-markdown": "^8.0.3", "react-pdf": "^6.2.2", "react-player": "^2.11.2", - "react-redux": "^8.1.3", + "react-redux": "^9.0.4", "react-rnd": "^10.3.7", "react-router-dom": "^6.14.0", "react-selecto": "^1.22.0", @@ -130,7 +130,6 @@ "react-virtuoso": "^4.3.11", "react-window": "^1.8.9", "react-window-infinite-loader": "^1.0.9", - "redux-logger": "^3.0.6", "rehype-raw": "^6.1.1", "rehype-sanitize": "^5.0.1", "remark-gfm": "^3.0.1", @@ -159,7 +158,6 @@ "@types/react-slick": "^0.23.10", "@types/react-window": "^1.8.5", "@types/react-window-infinite-loader": "^1.0.6", - "@types/redux-logger": "^3.0.9", "@types/streamsaver": "^2.0.1", "@types/tern": "^0.23.5", "@types/toposort": "^2.0.4", diff --git a/apps/builder/src/middleware/guideAsync/index.ts b/apps/builder/src/middleware/guideAsync/index.ts index 6a67e4e03c..c47823252b 100644 --- a/apps/builder/src/middleware/guideAsync/index.ts +++ b/apps/builder/src/middleware/guideAsync/index.ts @@ -1,8 +1,11 @@ -import { Middleware } from "@reduxjs/toolkit" +import { Middleware, isAction } from "@reduxjs/toolkit" import { guideUpdate } from "@/middleware/guideAsync/guideUpdate" import { getGuideStatus } from "@/redux/guide/guideSelector" export const guideAsync: Middleware = (store) => (next) => (action) => { + if (!isAction(action) || !("payload" in action)) { + return next(action) + } const isGuideOpen = getGuideStatus(store.getState()) if (isGuideOpen) { guideUpdate(store.getState(), store.dispatch, action) diff --git a/apps/builder/src/middleware/mixpanelReport/index.ts b/apps/builder/src/middleware/mixpanelReport/index.ts index 4ad81a5855..19aed5a3b7 100644 --- a/apps/builder/src/middleware/mixpanelReport/index.ts +++ b/apps/builder/src/middleware/mixpanelReport/index.ts @@ -1,7 +1,10 @@ -import { Middleware } from "@reduxjs/toolkit" +import { Middleware, isAction } from "@reduxjs/toolkit" import { reportMessage } from "./reportMessage" export const mixpanelReport: Middleware = (store) => (next) => (action) => { + if (!isAction(action) || !("payload" in action)) { + return next(action) + } const { type } = action const typeList = type.split("/") const isRemoteAction = typeList[typeList.length - 1] === "remote" diff --git a/apps/builder/src/middleware/reduxAsync/index.ts b/apps/builder/src/middleware/reduxAsync/index.ts index 2419427c5c..4f7490d2ae 100644 --- a/apps/builder/src/middleware/reduxAsync/index.ts +++ b/apps/builder/src/middleware/reduxAsync/index.ts @@ -1,11 +1,14 @@ -import * as Redux from "@reduxjs/toolkit" +import { Middleware, isAction } from "@reduxjs/toolkit" import { illaSnapshot } from "@/page/App/components/DotPanel/constant/snapshotNew" import { getExecutionWidgetLayoutInfo } from "@/redux/currentApp/executionTree/executionSelector" import { RootState } from "@/store" import { receiveMessage } from "./receiveMessages" import { sendMessage } from "./sendMessage" -export const reduxAsync: Redux.Middleware = (store) => (next) => (action) => { +export const reduxAsync: Middleware = (store) => (next) => (action) => { + if (!isAction(action) || !("payload" in action)) { + return next(action) + } const { type } = action const typeList = type.split("/") const isRemoteAction = typeList[typeList.length - 1] === "remote" diff --git a/apps/builder/src/middleware/undoRedo/index.ts b/apps/builder/src/middleware/undoRedo/index.ts index 1e98d3e4c1..eb7afaa58e 100644 --- a/apps/builder/src/middleware/undoRedo/index.ts +++ b/apps/builder/src/middleware/undoRedo/index.ts @@ -1,9 +1,12 @@ -import { Middleware } from "@reduxjs/toolkit" +import { Middleware, isAction } from "@reduxjs/toolkit" import { REDUX_ACTION_FROM } from "./interface" import { undoRedoMethod } from "./method" export const UndoRedo: Middleware = (store) => (next) => (action) => { - if (action.from && action.from === REDUX_ACTION_FROM.WS) { + if (!isAction(action) || !("payload" in action)) { + return next(action) + } + if ("from" in action && action.from && action.from === REDUX_ACTION_FROM.WS) { const resp = next(action) return resp } diff --git a/apps/builder/src/page/App/Module/PageNavBar/ShareAppButton/index.tsx b/apps/builder/src/page/App/Module/PageNavBar/ShareAppButton/index.tsx index f421eda614..ad7717bc05 100644 --- a/apps/builder/src/page/App/Module/PageNavBar/ShareAppButton/index.tsx +++ b/apps/builder/src/page/App/Module/PageNavBar/ShareAppButton/index.tsx @@ -120,7 +120,7 @@ export const ShareAppButton: FC = (props) => { dispatch( appInfoActions.updateAppInfoReducer({ ...appInfo, - appName: appConfig.publishWithAIAgent, + appName: appConfig.appName, config: { ...appInfo.config, description: appConfig.appDesc, diff --git a/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts b/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts index 03d8c70627..4249ec0699 100644 --- a/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts +++ b/apps/builder/src/redux/currentApp/appInfo/appInfoSlice.ts @@ -1,6 +1,4 @@ -import { AppInfoShape } from "@illa-public/public-types" import { createSlice } from "@reduxjs/toolkit" -import { SliceCaseReducers } from "@reduxjs/toolkit/src/createSlice" import { updateAppContributeReducer, updateAppDeployedReducer, @@ -9,11 +7,7 @@ import { } from "@/redux/currentApp/appInfo/appInfoReducer" import { DashboardAppInitialState } from "./appInfoState" -const appInfoSlice = createSlice< - AppInfoShape, - SliceCaseReducers, - "appInfo" ->({ +const appInfoSlice = createSlice({ name: "appInfo", initialState: DashboardAppInitialState, reducers: { diff --git a/apps/builder/src/store.ts b/apps/builder/src/store.ts index 6b0f227dc1..03e698544d 100644 --- a/apps/builder/src/store.ts +++ b/apps/builder/src/store.ts @@ -7,7 +7,6 @@ import { configureStore, createListenerMiddleware, } from "@reduxjs/toolkit" -import { logger } from "redux-logger" import { guideAsync } from "@/middleware/guideAsync" import { reduxAsync } from "@/middleware/reduxAsync" import aiAgent from "@/redux/aiAgent/dashboardTeamAIAgentSlice" @@ -40,10 +39,6 @@ const appReducer = combineReducers({ const middlewares = [reduxAsync, UndoRedo, guideAsync] -if (import.meta.env.ILLA_APP_ENV === "development") { - middlewares.push(logger) -} - if (isCloudVersion) { middlewares.unshift(mixpanelReport) } diff --git a/apps/cloud/package.json b/apps/cloud/package.json index b68ce5c7ac..16be95c5a1 100644 --- a/apps/cloud/package.json +++ b/apps/cloud/package.json @@ -34,7 +34,7 @@ "@illa-public/user-data": "workspace:*", "@illa-public/user-role-utils": "workspace:*", "@illa-public/utils": "workspace:*", - "@reduxjs/toolkit": "^1.9.7", + "@reduxjs/toolkit": "^2.0.1", "axios": "^1.6.2", "dayjs": "^1.11.10", "fuse.js": "^6.6.2", @@ -44,7 +44,7 @@ "lodash": "^4.17.21", "react-hook-form": "^7.40.0", "react-i18next": "^13.5.0", - "react-redux": "^8.1.3", + "react-redux": "^9.0.4", "react-router-dom": "^6.14.0", "swr": "^2.2.4", "uuid": "^9.0.0" diff --git a/packages/illa-public-component b/packages/illa-public-component index d178dc637e..37e095598f 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit d178dc637e7c4486c4d6360490362c62d535c116 +Subproject commit 37e095598f3c9a9d65152f63a41d2a8acca441cb diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8f72d96652..0e71332584 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -250,8 +250,8 @@ importers: specifier: ^2.18.1 version: 2.18.1(react-dom@18.2.0)(react@18.2.0) '@reduxjs/toolkit': - specifier: ^1.9.7 - version: 1.9.7(react-redux@8.1.3)(react@18.2.0) + specifier: ^2.0.1 + version: 2.0.1(react-redux@9.0.4)(react@18.2.0) '@rjsf/core': specifier: ^5.10.0 version: 5.10.0(@rjsf/utils@5.10.0)(react@18.2.0) @@ -397,8 +397,8 @@ importers: specifier: ^2.11.2 version: 2.11.2(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) react-rnd: specifier: ^10.3.7 version: 10.4.1(react-dom@18.2.0)(react@18.2.0) @@ -426,9 +426,6 @@ importers: react-window-infinite-loader: specifier: ^1.0.9 version: 1.0.9(react-dom@18.2.0)(react@18.2.0) - redux-logger: - specifier: ^3.0.6 - version: 3.0.6 rehype-raw: specifier: ^6.1.1 version: 6.1.1 @@ -508,9 +505,6 @@ importers: '@types/react-window-infinite-loader': specifier: ^1.0.6 version: 1.0.6 - '@types/redux-logger': - specifier: ^3.0.9 - version: 3.0.9 '@types/streamsaver': specifier: ^2.0.1 version: 2.0.1 @@ -614,8 +608,8 @@ importers: specifier: workspace:* version: link:../../packages/illa-public-component/utils '@reduxjs/toolkit': - specifier: ^1.9.7 - version: 1.9.7(react-redux@8.1.3)(react@18.2.0) + specifier: ^2.0.1 + version: 2.0.1(react-redux@9.0.4)(react@18.2.0) axios: specifier: ^1.6.2 version: 1.6.2 @@ -644,8 +638,8 @@ importers: specifier: ^13.5.0 version: 13.5.0(i18next@23.7.6)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) react-router-dom: specifier: ^6.14.0 version: 6.16.0(react-dom@18.2.0)(react@18.2.0) @@ -2753,8 +2747,8 @@ importers: specifier: ^13.5.0 version: 13.5.0(i18next@23.7.6)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) react-router-dom: specifier: ^6.4.4 version: 6.16.0(react-dom@18.2.0)(react@18.2.0) @@ -2921,8 +2915,8 @@ importers: specifier: ^13.5.0 version: 13.5.0(i18next@23.7.6)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) react-router-dom: specifier: ^6.14.0 version: 6.16.0(react-dom@18.2.0)(react@18.2.0) @@ -3307,8 +3301,8 @@ importers: specifier: ^13.5.0 version: 13.5.0(i18next@23.7.6)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) devDependencies: tsconfig: specifier: workspace:* @@ -3448,8 +3442,8 @@ importers: specifier: ^13.5.0 version: 13.5.0(i18next@23.7.6)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) react-window: specifier: ^1.8.9 version: 1.8.9(react-dom@18.2.0)(react@18.2.0) @@ -3647,8 +3641,8 @@ importers: specifier: ^13.5.0 version: 13.5.0(i18next@23.7.6)(react-dom@18.2.0)(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) react-router-dom: specifier: ^6.14.0 version: 6.16.0(react-dom@18.2.0)(react@18.2.0) @@ -3749,8 +3743,8 @@ importers: specifier: workspace:* version: link:../utils '@reduxjs/toolkit': - specifier: ^1.9.7 - version: 1.9.7(react-redux@8.1.3)(react@18.2.0) + specifier: ^2.0.1 + version: 2.0.1(react-redux@9.0.4)(react@18.2.0) '@types/react': specifier: ^18.2.38 version: 18.2.38 @@ -3764,8 +3758,8 @@ importers: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) react-redux: - specifier: ^8.1.3 - version: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) + specifier: ^9.0.4 + version: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) devDependencies: tsconfig: specifier: workspace:* @@ -6177,23 +6171,23 @@ packages: resolution: {integrity: sha512-jOuyqzWLeXvQcoAu6TCVWHAuko+sDt0JjawNHBGqUNLywMtTCvYP0L0PiqJZOUCUeRYGdUy0AKxQ+30vAkvwag==} dev: false - /@reduxjs/toolkit@1.9.7(react-redux@8.1.3)(react@18.2.0): - resolution: {integrity: sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==} + /@reduxjs/toolkit@2.0.1(react-redux@9.0.4)(react@18.2.0): + resolution: {integrity: sha512-fxIjrR9934cmS8YXIGd9e7s1XRsEU++aFc9DVNMFMRTM5Vtsg2DCRMj21eslGtDt43IUf9bJL3h5bwUlZleibA==} peerDependencies: react: ^18.2.0 - react-redux: ^7.2.1 || ^8.0.2 + react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0 peerDependenciesMeta: react: optional: true react-redux: optional: true dependencies: - immer: 9.0.21 + immer: 10.0.3 react: 18.2.0 - react-redux: 8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1) - redux: 4.2.1 - redux-thunk: 2.4.2(redux@4.2.1) - reselect: 4.1.8 + react-redux: 9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0) + redux: 5.0.0 + redux-thunk: 3.1.0(redux@5.0.0) + reselect: 5.0.1 dev: false /@remix-run/router@1.9.0: @@ -7086,13 +7080,6 @@ packages: '@types/unist': 2.0.6 dev: false - /@types/hoist-non-react-statics@3.3.1: - resolution: {integrity: sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==} - dependencies: - '@types/react': 18.2.38 - hoist-non-react-statics: 3.3.2 - dev: false - /@types/inquirer@8.2.6: resolution: {integrity: sha512-3uT88kxg8lNzY8ay2ZjP44DKcRaTGztqeIvN2zHvhzIBH/uAPaL75aBtdNRKbA7xXoMbBt5kX0M00VKAnfOYlA==} dependencies: @@ -7281,12 +7268,6 @@ packages: '@types/scheduler': 0.16.3 csstype: 3.1.2 - /@types/redux-logger@3.0.9: - resolution: {integrity: sha512-cwYhVbYNgH01aepeMwhd0ABX6fhVB2rcQ9m80u8Fl50ZODhsZ8RhQArnLTkE7/Zrfq4Sz/taNoF7DQy9pCZSKg==} - dependencies: - redux: 4.2.1 - dev: true - /@types/scheduler@0.16.3: resolution: {integrity: sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==} @@ -9252,10 +9233,6 @@ packages: dependencies: character-entities: 2.0.2 - /deep-diff@0.3.8: - resolution: {integrity: sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug==} - dev: false - /deep-diff@1.0.2: resolution: {integrity: sha512-aWS3UIVH+NPGCD1kki+DCU9Dua032iSsO43LqQpcs4R3+dVv7tX0qBGjiVHJHjplsoUM2XRO/KB92glqc68awg==} dev: false @@ -11279,8 +11256,8 @@ packages: resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} dev: false - /immer@9.0.21: - resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==} + /immer@10.0.3: + resolution: {integrity: sha512-pwupu3eWfouuaowscykeckFmVTpqbzW+rXFCX8rQLkZzM9ftBmU/++Ra+o+L27mz03zJTlyV4UUr+fdKNffo4A==} dev: false /import-fresh@3.3.0: @@ -14684,37 +14661,25 @@ packages: react-fast-compare: 3.2.0 dev: false - /react-redux@8.1.3(@types/react-dom@18.2.17)(@types/react@18.2.38)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1): - resolution: {integrity: sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==} + /react-redux@9.0.4(@types/react@18.2.38)(react@18.2.0)(redux@5.0.0): + resolution: {integrity: sha512-9J1xh8sWO0vYq2sCxK2My/QO7MzUMRi3rpiILP/+tDr8krBHixC6JMM17fMK88+Oh3e4Ae6/sHIhNBgkUivwFA==} peerDependencies: '@types/react': ^18.2.38 - '@types/react-dom': ^18.2.17 react: ^18.2.0 - react-dom: ^18.2.0 - react-native: '>=0.59' - redux: ^4 || ^5.0.0-beta.0 + react-native: '>=0.69' + redux: ^5.0.0 peerDependenciesMeta: '@types/react': optional: true - '@types/react-dom': - optional: true - react-dom: - optional: true react-native: optional: true redux: optional: true dependencies: - '@babel/runtime': 7.23.2 - '@types/hoist-non-react-statics': 3.3.1 '@types/react': 18.2.38 - '@types/react-dom': 18.2.17 '@types/use-sync-external-store': 0.0.3 - hoist-non-react-statics: 3.3.2 react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-is: 18.2.0 - redux: 4.2.1 + redux: 5.0.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: false @@ -15029,24 +14994,23 @@ packages: strip-indent: 3.0.0 dev: true - /redux-logger@3.0.6: - resolution: {integrity: sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg==} - dependencies: - deep-diff: 0.3.8 - dev: false - - /redux-thunk@2.4.2(redux@4.2.1): - resolution: {integrity: sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==} + /redux-thunk@3.1.0(redux@5.0.0): + resolution: {integrity: sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==} peerDependencies: - redux: ^4 + redux: ^5.0.0 dependencies: - redux: 4.2.1 + redux: 5.0.0 dev: false /redux@4.2.1: resolution: {integrity: sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==} dependencies: '@babel/runtime': 7.22.6 + dev: false + + /redux@5.0.0: + resolution: {integrity: sha512-blLIYmYetpZMET6Q6uCY7Jtl/Im5OBldy+vNPauA8vvsdqyt66oep4EUpAMWNHauTC6xa9JuRPhRB72rY82QGA==} + dev: false /refractor@3.6.0: resolution: {integrity: sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==} @@ -15268,6 +15232,10 @@ packages: resolution: {integrity: sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==} dev: false + /reselect@5.0.1: + resolution: {integrity: sha512-D72j2ubjgHpvuCiORWkOUxndHJrxDaSolheiz5CO+roz8ka97/4msh2E8F5qay4GawR5vzBt5MkbDHT+Rdy/Wg==} + dev: false + /resize-observer-polyfill@1.5.1: resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==} dev: false From 41fe07bffb8749e55365630178fef2fd2a14ed1a Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:34:02 +0800 Subject: [PATCH 3/4] chore: update submodule --- packages/illa-design | 2 +- packages/illa-public-component | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/illa-design b/packages/illa-design index 468d557217..7c392dac04 160000 --- a/packages/illa-design +++ b/packages/illa-design @@ -1 +1 @@ -Subproject commit 468d5572172739049733dc489fd4d846ac5d4279 +Subproject commit 7c392dac04e057b4afadc61cfaa779680b5689f3 diff --git a/packages/illa-public-component b/packages/illa-public-component index 37e095598f..00bd500fc6 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit 37e095598f3c9a9d65152f63a41d2a8acca441cb +Subproject commit 00bd500fc6053d36f5a39e604f6c9f81f74baf98 From 3535d4d4fdc68b69ad470446073b4b8bd84231aa Mon Sep 17 00:00:00 2001 From: AruSeito <41471697+AruSeito@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:14:35 +0800 Subject: [PATCH 4/4] chore: update submodule --- packages/illa-public-component | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/illa-public-component b/packages/illa-public-component index 00bd500fc6..506fb3220e 160000 --- a/packages/illa-public-component +++ b/packages/illa-public-component @@ -1 +1 @@ -Subproject commit 00bd500fc6053d36f5a39e604f6c9f81f74baf98 +Subproject commit 506fb3220e0c783802759365fc919a419bdf98a7