diff --git a/packages/app/src/components/loading/index.tsx b/packages/app/src/components/loading/index.tsx index 76ea2a25b6..d435470de9 100644 --- a/packages/app/src/components/loading/index.tsx +++ b/packages/app/src/components/loading/index.tsx @@ -1,20 +1,3 @@ -import { - StyledLoadingWrapper, - StyledLoading, - StyledLoadingItem, -} from './styled'; - -export const Loading = ({ size = 40 }: { size?: number }) => { - return ( - - - - - - - - - ); -}; - +import Loading from './loading'; +export * from './page-loading'; export default Loading; diff --git a/packages/app/src/components/loading/loading.tsx b/packages/app/src/components/loading/loading.tsx new file mode 100644 index 0000000000..76ea2a25b6 --- /dev/null +++ b/packages/app/src/components/loading/loading.tsx @@ -0,0 +1,20 @@ +import { + StyledLoadingWrapper, + StyledLoading, + StyledLoadingItem, +} from './styled'; + +export const Loading = ({ size = 40 }: { size?: number }) => { + return ( + + + + + + + + + ); +}; + +export default Loading; diff --git a/packages/app/src/components/loading/page-loading.tsx b/packages/app/src/components/loading/page-loading.tsx new file mode 100644 index 0000000000..5b12693930 --- /dev/null +++ b/packages/app/src/components/loading/page-loading.tsx @@ -0,0 +1,31 @@ +import { styled } from '@/styles'; +import Loading from './loading'; + +// Used for the full page loading +const StyledLoadingContainer = styled('div')(({ theme }) => { + return { + height: '100vh', + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + color: '#6880FF', + h1: { + fontSize: '2em', + marginTop: '15px', + fontWeight: '600', + }, + }; +}); + +export const PageLoading = ({ text = 'Loading...' }: { text?: string }) => { + return ( + +
+ +

{text}

+
+ + ); +}; + +export default PageLoading; diff --git a/packages/app/src/components/workspace-layout/index.tsx b/packages/app/src/components/workspace-layout/index.tsx index cd111dd958..62dacdbf80 100644 --- a/packages/app/src/components/workspace-layout/index.tsx +++ b/packages/app/src/components/workspace-layout/index.tsx @@ -2,10 +2,43 @@ import HelpIsland from '@/components/help-island'; import { WorkSpaceSliderBar } from '@/components/workspace-slider-bar'; import { useRouter } from 'next/router'; import { StyledPage, StyledWrapper } from './styles'; -import { PropsWithChildren } from 'react'; +import { PropsWithChildren, useEffect, useState } from 'react'; +import { useAppState } from '@/providers/app-state-provider'; + +export const WorkspaceDefender = ({ children }: PropsWithChildren) => { + const router = useRouter(); + const [workspaceLoaded, setWorkspaceLoaded] = useState(false); + const { synced, loadWorkspace, workspacesMeta } = useAppState(); + + useEffect(() => { + const initWorkspace = async () => { + const workspaceId = + (router.query.workspaceId as string) || + workspacesMeta?.[0]?.id || + new Date().getTime().toString(); + + await loadWorkspace(workspaceId); + setWorkspaceLoaded(true); + }; + if (!synced) { + return; + } + + initWorkspace(); + }, [ + loadWorkspace, + router.pathname, + router.query.workspaceId, + synced, + workspaceLoaded, + workspacesMeta, + ]); + return <>{workspaceLoaded ? children : null}; +}; export const WorkspaceLayout = ({ children }: PropsWithChildren) => { const router = useRouter(); + return ( @@ -17,4 +50,11 @@ export const WorkspaceLayout = ({ children }: PropsWithChildren) => { ); }; -export default WorkspaceLayout; +export const Layout = ({ children }: PropsWithChildren) => { + return ( + + {children} + + ); +}; +export default Layout; diff --git a/packages/app/src/components/workspace-slider-bar/index.tsx b/packages/app/src/components/workspace-slider-bar/index.tsx index ea9cee1636..c1b9ef2970 100644 --- a/packages/app/src/components/workspace-slider-bar/index.tsx +++ b/packages/app/src/components/workspace-slider-bar/index.tsx @@ -140,7 +140,7 @@ export const WorkSpaceSliderBar = () => { { - const pageId = await createPage?.current?.(); + const pageId = await createPage?.(); if (pageId) { openPage(pageId); } diff --git a/packages/app/src/pages/_app.tsx b/packages/app/src/pages/_app.tsx index 858c5eae73..3a97286822 100644 --- a/packages/app/src/pages/_app.tsx +++ b/packages/app/src/pages/_app.tsx @@ -8,12 +8,15 @@ import '@fontsource/space-mono'; import '@fontsource/poppins'; import '../utils/print-build-info'; import ProviderComposer from '@/components/provider-composer'; -import type { ReactElement, ReactNode } from 'react'; +import type { PropsWithChildren, ReactElement, ReactNode } from 'react'; import type { NextPage } from 'next'; import { AppStateProvider } from '@/providers/app-state-provider/provider'; import ConfirmProvider from '@/providers/confirm-provider'; import { ModalProvider } from '@/providers/global-modal-provider'; - +import { useRouter } from 'next/router'; +import { useEffect, useState } from 'react'; +import { useAppState } from '@/providers/app-state-provider'; +import { PageLoading } from '@/components/loading'; const ThemeProvider = dynamic(() => import('@/providers/themeProvider'), { ssr: false, }); @@ -26,7 +29,7 @@ type AppPropsWithLayout = AppProps & { Component: NextPageWithLayout; }; -function MyApp({ Component, pageProps }: AppPropsWithLayout) { +const App = ({ Component, pageProps }: AppPropsWithLayout) => { const getLayout = Component.getLayout || (page => page); return ( @@ -40,10 +43,24 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) { , ]} > - {getLayout()} + {getLayout()} ); -} +}; -export default MyApp; +const AppDefender = ({ children }: PropsWithChildren) => { + const router = useRouter(); + + const { synced } = useAppState(); + + useEffect(() => { + if (router.pathname === '/') { + router.replace('/workspace'); + } + }, [router]); + + return
{synced ? children : }
; +}; + +export default App; diff --git a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx index e2bcb58ff6..8fc7989363 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/[pageId].tsx @@ -1,16 +1,19 @@ -import { useRef, useEffect, ReactElement } from 'react'; +import { + useRef, + useEffect, + useState, + ReactElement, + PropsWithChildren, +} from 'react'; import { styled } from '@/styles'; import { EditorHeader } from '@/components/header'; import EdgelessToolbar from '@/components/edgeless-toolbar'; import MobileModal from '@/components/mobile-modal'; -import { - useLoadWorkspace, - useLoadPage, -} from '@/providers/app-state-provider/hooks'; import { useAppState } from '@/providers/app-state-provider/context'; import exampleMarkdown from '@/static/example-markdown'; import type { NextPageWithLayout } from '../..//_app'; import WorkspaceLayout from '@/components/workspace-layout'; +import { useRouter } from 'next/router'; const StyledEditorContainer = styled('div')(({ theme }) => { return { @@ -20,9 +23,8 @@ const StyledEditorContainer = styled('div')(({ theme }) => { const Page: NextPageWithLayout = () => { const editorContainer = useRef(null); - const workspace = useLoadWorkspace(); - const page = useLoadPage(); - const { createEditor, setEditor } = useAppState(); + const { createEditor, setEditor, currentPage, currentWorkspace } = + useAppState(); useEffect(() => { const ret = () => { @@ -32,29 +34,29 @@ const Page: NextPageWithLayout = () => { } }; - if (!workspace || !page) { - return ret; - } - - const editor = createEditor?.current?.(page); + const editor = createEditor?.current?.(currentPage!); if (editor) { editorContainer.current?.appendChild(editor); setEditor?.current?.(editor); - if (page.isEmpty) { + if (currentPage!.isEmpty) { const title = 'Welcome to the AFFiNE Alpha'; - const pageId = page.addBlock({ + const pageId = currentPage!.addBlock({ flavour: 'affine:page', title, }); - const groupId = page.addBlock({ flavour: 'affine:group' }, pageId); + const groupId = currentPage!.addBlock( + { flavour: 'affine:group' }, + pageId + ); editor.clipboard.importMarkdown(exampleMarkdown, `${groupId}`); - workspace.setPageMeta(page.id, { title }); - page.resetHistory(); + + currentWorkspace!.setPageMeta(currentPage!.id, { title }); + currentPage!.resetHistory(); } } return ret; - }, [workspace, page, createEditor, setEditor]); + }, [currentWorkspace, currentPage, createEditor, setEditor]); return ( <> @@ -66,8 +68,34 @@ const Page: NextPageWithLayout = () => { ); }; +const PageDefender = ({ children }: PropsWithChildren) => { + const router = useRouter(); + const [pageLoaded, setPageLoaded] = useState(false); + const { currentWorkspace, createPage, loadPage } = useAppState(); + useEffect(() => { + const initPage = async () => { + const pageId = router.query.pageId as string; + const isPageExist = !!currentWorkspace!.meta.pageMetas.find( + p => p.id === pageId + ); + if (!isPageExist) { + await createPage(pageId); + } + await loadPage(pageId); + setPageLoaded(true); + }; + initPage(); + }, [createPage, currentWorkspace, loadPage, router.query.pageId]); + + return <>{pageLoaded ? children : null}; +}; + Page.getLayout = function getLayout(page: ReactElement) { - return {page}; + return ( + + {page} + + ); }; export default Page; diff --git a/packages/app/src/pages/workspace/[workspaceId]/all.tsx b/packages/app/src/pages/workspace/[workspaceId]/all.tsx index d5b0e1c798..dacb16bd59 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/all.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/all.tsx @@ -1,17 +1,14 @@ -import { useLoadWorkspace } from '@/providers/app-state-provider/hooks'; import { PageList } from '@/components/page-list'; import { AllPagesIcon } from '@blocksuite/icons'; import usePageMetaList from '@/hooks/use-page-meta-list'; import { PageListHeader } from '@/components/header'; -import { NextPageWithLayout } from '@/pages/_app'; import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; -const All: NextPageWithLayout = () => { - const workspace = useLoadWorkspace(); +const All = () => { const pageMetaList = usePageMetaList(); - return workspace ? ( + return ( <> }>All Page { showFavoriteTag={true} /> - ) : null; + ); }; All.getLayout = function getLayout(page: ReactElement) { diff --git a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx index d96a0b93e7..bde04923d6 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/favorite.tsx @@ -1,21 +1,18 @@ -import { useLoadWorkspace } from '@/providers/app-state-provider/hooks'; import { PageListHeader } from '@/components/header'; import { PageList } from '@/components/page-list'; import { FavouritesIcon } from '@blocksuite/icons'; import usePageMetaList from '@/hooks/use-page-meta-list'; -import { NextPageWithLayout } from '@/pages/_app'; import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; -export const Favorite: NextPageWithLayout = () => { - const workspace = useLoadWorkspace(); +export const Favorite = () => { const pageMetaList = usePageMetaList(); - return workspace ? ( + return ( <> }>Favourites p.favorite && !p.trash)} /> - ) : null; + ); }; Favorite.getLayout = function getLayout(page: ReactElement) { return {page}; diff --git a/packages/app/src/pages/workspace/[workspaceId]/index.tsx b/packages/app/src/pages/workspace/[workspaceId]/index.tsx index 88479715ea..c0f1d03f73 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/index.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/index.tsx @@ -1,13 +1,31 @@ -import { - useLoadWorkspace, - useLoadPage, -} from '@/providers/app-state-provider/hooks'; +import React, { ReactElement, useEffect } from 'react'; +import { useRouter } from 'next/router'; +import { useAppState } from '@/providers/app-state-provider/context'; +import WorkspaceLayout from '@/components/workspace-layout'; -const Page = () => { - useLoadWorkspace(); - useLoadPage(); +const WorkspaceIndex = () => { + const router = useRouter(); + const { createPage, currentWorkspaceId, currentWorkspace } = useAppState(); + + useEffect(() => { + const initPage = async () => { + const savedPageId = currentWorkspace!.meta.pageMetas[0]?.id; + if (savedPageId) { + router.replace(`/workspace/${currentWorkspaceId}/${savedPageId}`); + return; + } + + const pageId = await createPage(); + router.replace(`/workspace/${currentWorkspaceId}/${pageId}`); + }; + initPage(); + }, [currentWorkspace, currentWorkspaceId, createPage, router]); return <>; }; -export default Page; +WorkspaceIndex.getLayout = function getLayout(page: ReactElement) { + return {page}; +}; + +export default WorkspaceIndex; diff --git a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx index 6125a9f2b9..9e7f397669 100644 --- a/packages/app/src/pages/workspace/[workspaceId]/trash.tsx +++ b/packages/app/src/pages/workspace/[workspaceId]/trash.tsx @@ -1,21 +1,18 @@ -import { useLoadWorkspace } from '@/providers/app-state-provider/hooks'; import { PageListHeader } from '@/components/header'; import { PageList } from '@/components/page-list'; import { TrashIcon } from '@blocksuite/icons'; import usePageMetaList from '@/hooks/use-page-meta-list'; -import { NextPageWithLayout } from '@/pages/_app'; import { ReactElement } from 'react'; import WorkspaceLayout from '@/components/workspace-layout'; -export const Trash: NextPageWithLayout = () => { - const workspace = useLoadWorkspace(); +export const Trash = () => { const pageMetaList = usePageMetaList(); - return workspace ? ( + return ( <> }>Trash p.trash)} isTrash={true} /> - ) : null; + ); }; Trash.getLayout = function getLayout(page: ReactElement) { diff --git a/packages/app/src/pages/workspace/index.tsx b/packages/app/src/pages/workspace/index.tsx index 1f7dd2d518..0f1688d1de 100644 --- a/packages/app/src/pages/workspace/index.tsx +++ b/packages/app/src/pages/workspace/index.tsx @@ -1,5 +1,21 @@ -const Page = () => { - return
Hello, there is [workspace]/index.
; +import React, { ReactElement, useEffect } from 'react'; +import WorkspaceLayout from '@/components/workspace-layout'; +import { useAppState } from '@/providers/app-state-provider'; +import { useRouter } from 'next/router'; + +export const WorkspaceIndex = () => { + const router = useRouter(); + const { currentWorkspaceId } = useAppState(); + useEffect(() => { + if (currentWorkspaceId) { + router.replace(`/workspace/${currentWorkspaceId}`); + } + }, [currentWorkspaceId, router]); + return <>; }; -export default Page; +WorkspaceIndex.getLayout = function getLayout(page: ReactElement) { + return {page}; +}; + +export default WorkspaceIndex; diff --git a/packages/app/src/providers/app-state-provider/context.ts b/packages/app/src/providers/app-state-provider/context.ts index e5b1c57d4b..65c9fc842e 100644 --- a/packages/app/src/providers/app-state-provider/context.ts +++ b/packages/app/src/providers/app-state-provider/context.ts @@ -23,6 +23,7 @@ export interface AppStateValue { currentPage: StorePage | null; editor: EditorContainer | null; + synced: boolean; } export interface AppStateContext extends AppStateValue { @@ -31,15 +32,9 @@ export interface AppStateContext extends AppStateValue { ((page: StorePage) => EditorContainer | null) | undefined >; setEditor?: MutableRefObject<((page: EditorContainer) => void) | undefined>; - loadWorkspace?: MutableRefObject< - ((workspaceId: string) => Promise | null) | undefined - >; - loadPage?: MutableRefObject< - ((pageId: string) => Promise | null) | undefined - >; - createPage?: MutableRefObject< - ((pageId?: string) => Promise) | undefined - >; + loadWorkspace: (workspaceId: string) => Promise; + loadPage: (pageId: string) => Promise; + createPage: (pageId?: string) => Promise; } export const AppState = createContext({ @@ -56,9 +51,10 @@ export const AppState = createContext({ setState: () => {}, createEditor: undefined, setEditor: undefined, - loadWorkspace: undefined, - loadPage: undefined, - createPage: undefined, + loadWorkspace: () => Promise.resolve(null), + loadPage: () => Promise.resolve(null), + createPage: () => Promise.resolve(null), + synced: false, workspaces: {}, }); diff --git a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx index 2f22e01a07..3f81edf0bc 100644 --- a/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx +++ b/packages/app/src/providers/app-state-provider/dynamic-blocksuite.tsx @@ -89,15 +89,12 @@ const DynamicBlocksuite = ({ p => p instanceof IndexedDBDocProvider ); if (indexDBProvider) { - (indexDBProvider as IndexedDBDocProvider).on('synced', async () => { - const updates = await downloadWorkspace({ workspaceId }); - - if (updates && updates.byteLength) { - Workspace.Y.applyUpdate(workspace.doc, new Uint8Array(updates)); - // if after update, the space:meta is empty, then we need to get map with doc - workspace.doc.getMap('space:meta'); - } - + (indexDBProvider as IndexedDBDocProvider)?.on('synced', async () => { + // const updates = await downloadWorkspace({ workspaceId }); + // updates && + // Workspace.Y.applyUpdate(workspace.doc, new Uint8Array(updates)); + // if after update, the space:meta is empty, then we need to get map with doc + workspace.doc.getMap('space:meta'); resolve(workspace); }); } else { diff --git a/packages/app/src/providers/app-state-provider/hooks.ts b/packages/app/src/providers/app-state-provider/hooks.ts index 69129c87e7..7f5f2822ed 100644 --- a/packages/app/src/providers/app-state-provider/hooks.ts +++ b/packages/app/src/providers/app-state-provider/hooks.ts @@ -9,7 +9,7 @@ export const useLoadWorkspace = () => { const workspaceId = router.query.workspaceId as string; useEffect(() => { - loadWorkspace?.current?.(workspaceId); + loadWorkspace?.(workspaceId); }, [workspaceId, loadWorkspace]); return currentWorkspaceId === workspaceId ? currentWorkspace : null; @@ -29,7 +29,7 @@ export const useLoadPage = () => { } const page = pageId ? workspace?.getPage(pageId) : null; if (page) { - loadPage?.current?.(pageId); + loadPage?.(pageId); return; } @@ -39,7 +39,7 @@ export const useLoadPage = () => { return; } - createPage?.current?.()?.then(async pageId => { + createPage?.()?.then(async pageId => { if (!pageId) { return; } diff --git a/packages/app/src/providers/app-state-provider/provider.tsx b/packages/app/src/providers/app-state-provider/provider.tsx index 2e38922e06..41e18901f5 100644 --- a/packages/app/src/providers/app-state-provider/provider.tsx +++ b/packages/app/src/providers/app-state-provider/provider.tsx @@ -8,7 +8,7 @@ import { WorkspaceType, getWorkspaceDetail, } from '@pathfinder/data-services'; -import { AppState } from './context'; +import { AppState, AppStateContext } from './context'; import type { AppStateValue, CreateEditorHandler, @@ -29,6 +29,9 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { currentPage: null, editor: null, workspaces: {}, + // Synced is used to ensure that the provider has synced with the server, + // So after Synced set to true, the other state is sure to be set. + synced: false, }); const [loadWorkspaceHandler, _setLoadWorkspaceHandler] = @@ -50,12 +53,14 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { [_setCreateEditorHandler] ); - const loadWorkspace = - useRef<(workspaceId: string) => Promise | null>(); + const loadWorkspace = useRef(() => + Promise.resolve(null) + ); loadWorkspace.current = async (workspaceId: string) => { if (state.currentWorkspaceId === workspaceId) { return state.currentWorkspace; } + const workspace = (await loadWorkspaceHandler?.(workspaceId, true)) || null; // @ts-expect-error @@ -72,7 +77,9 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { })); return workspace; }; - const loadPage = useRef<(pageId: string) => Promise | null>(); + const loadPage = useRef(() => + Promise.resolve(null) + ); loadPage.current = async (pageId: string) => { const { currentWorkspace, currentPage } = state; if (pageId === currentPage?.pageId) { @@ -114,7 +121,9 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { setState(state => ({ ...state, editor })); }; - const createPage = useRef<(pageId?: string) => Promise>(); + const createPage = useRef(() => + Promise.resolve(null) + ); createPage.current = (pageId: string = Date.now().toString()) => new Promise(resolve => { @@ -130,8 +139,16 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { }); useEffect(() => { + if (!loadWorkspaceHandler) { + return; + } const callback = async (user: AccessTokenMessage | null) => { - const workspacesMeta = user ? await getWorkspaces() : []; + const workspacesMeta = user + ? await getWorkspaces().catch(() => { + return []; + }) + : []; + const workspacesList = await Promise.all( workspacesMeta.map(async ({ id }) => { const workspace = (await loadWorkspaceHandler?.(id)) || null; @@ -146,7 +163,13 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { }); // TODO: add meta info to workspace meta - setState(state => ({ ...state, user: user, workspacesMeta, workspaces })); + setState(state => ({ + ...state, + user: user, + workspacesMeta, + workspaces, + synced: true, + })); }; authorizationEvent.onChange(callback); @@ -161,9 +184,9 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { setState, createEditor, setEditor, - loadWorkspace, - loadPage, - createPage, + loadWorkspace: loadWorkspace.current, + loadPage: loadPage.current, + createPage: createPage.current, }), [state, setState, loadPage, loadWorkspace] ); @@ -174,7 +197,7 @@ export const AppStateProvider = ({ children }: { children?: ReactNode }) => { setLoadWorkspaceHandler={setLoadWorkspaceHandler} setCreateEditorHandler={setCreateEditorHandler} /> - {loadWorkspaceHandler ? children : null} + {children} ); }; diff --git a/packages/app/src/providers/global-modal-provider.tsx b/packages/app/src/providers/global-modal-provider.tsx index 1db3698f20..618152dea9 100644 --- a/packages/app/src/providers/global-modal-provider.tsx +++ b/packages/app/src/providers/global-modal-provider.tsx @@ -1,4 +1,4 @@ -import { createContext, useContext, useState } from 'react'; +import { createContext, useContext, useEffect, useState } from 'react'; import type { PropsWithChildren } from 'react'; import ShortcutsModal from '@/components/shortcuts-modal'; import ContactModal from '@/components/contact-modal'; @@ -49,6 +49,10 @@ export const ModalProvider = ({ [key]: visible ?? !modalMap[key], }); }; + useEffect(() => { + // @ts-ignore + window.triggerHandler = () => triggerHandler('login'); + }, [triggerHandler]); return ( =10.10.0} dependencies: '@grpc/proto-loader': 0.7.3 - '@types/node': 18.11.17 + '@types/node': 18.7.18 dev: false /@grpc/proto-loader/0.6.13: @@ -2375,10 +2375,10 @@ packages: /@types/node/18.11.17: resolution: {integrity: sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==} + dev: true /@types/node/18.7.18: resolution: {integrity: sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==} - dev: true /@types/parse-json/4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} @@ -2765,8 +2765,8 @@ packages: engines: {node: '>=4'} dev: true - /axios/1.2.1: - resolution: {integrity: sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A==} + /axios/1.2.0: + resolution: {integrity: sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw==} dependencies: follow-redirects: 1.15.2 form-data: 4.0.0 @@ -5659,7 +5659,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 18.11.17 + '@types/node': 18.7.18 long: 4.0.0 dev: false @@ -5678,7 +5678,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 18.11.17 + '@types/node': 18.7.18 long: 5.2.0 dev: false