Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
wqcstrong committed Sep 29, 2024
2 parents df11133 + a570c02 commit db3d144
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 18 deletions.
Binary file modified src/assets/image/debugger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/doc-banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/inspect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/dynamic-inject.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/modal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/module.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/page-spy-api.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/plugins.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/pnpm-install.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/replay-page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/image/screenshot/v1.9.2-offline-log-size.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/image/wechat-group-1.jpg
Binary file not shown.
4 changes: 3 additions & 1 deletion src/pages/Docs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Suspense } from 'react';
import { LoadingFallback } from '@/components/LoadingFallback';
import { TransitionContextWrapper } from '@/components/Transition';

export const Docs = () => {
const Docs = () => {
return (
<div className="docs">
<Suspense fallback={<LoadingFallback />}>
Expand All @@ -17,3 +17,5 @@ export const Docs = () => {
</div>
);
};

export default Docs;
16 changes: 9 additions & 7 deletions src/pages/Layouts/NavMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,16 @@ export const NavMenuOnPc = () => {
>
{/* Replay labs */}
{isDoc && (
<Link to="/replay-lab" className="menu-item labs">
<Space align="center">
<Icon component={ReplaySvg} style={{ fontSize: 18 }} />
<span>{t('common.replay-lab')}</span>
</Space>
</Link>
<>
<Link to="/replay-lab" className="menu-item labs">
<Space align="center">
<Icon component={ReplaySvg} style={{ fontSize: 18 }} />
<span>{t('common.replay-lab')}</span>
</Space>
</Link>
<Divider type="vertical" className="divider-bg" />
</>
)}
<Divider type="vertical" className="divider-bg" />
{/* Docs */}
<Link to="/docs" className="menu-item doc">
<Space align="center">
Expand Down
4 changes: 3 additions & 1 deletion src/pages/LogList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const FILE_STATUS: Record<
},
};

export const LogList = () => {
const LogList = () => {
const [form] = Form.useForm();
const { t } = useTranslation();

Expand Down Expand Up @@ -454,3 +454,5 @@ export const LogList = () => {
</Layout>
);
};

export default LogList;
4 changes: 3 additions & 1 deletion src/pages/Replay/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { useEventListener } from '@/utils/useEventListener';
import { useShallow } from 'zustand/react/shallow';
import { ErrorDetailDrawer } from '@/components/ErrorDetailDrawer';

export const Replay = () => {
const Replay = () => {
const { t } = useTranslation();
const { url } = useSearch();
const setAllData = useReplayStore((state) => state.setAllData);
Expand Down Expand Up @@ -147,3 +147,5 @@ export const Replay = () => {
</div>
);
};

export default Replay;
4 changes: 3 additions & 1 deletion src/pages/ReplayLabs/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { isDoc } from '@/utils/constants';
import { useThreshold } from '@/utils/useThreshold';
import { useTranslation } from 'react-i18next';

export const ReplayLabs = () => {
const ReplayLabs = () => {
const { t } = useTranslation('translation', { keyPrefix: 'lab' });
const isMobile = useThreshold();

Expand Down Expand Up @@ -85,3 +85,5 @@ export const ReplayLabs = () => {
</div>
);
};

export default ReplayLabs;
4 changes: 3 additions & 1 deletion src/pages/RoomList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const filterConnections = (
});
};

export const RoomList = () => {
const RoomList = () => {
const [form] = Form.useForm();
const { t } = useTranslation();

Expand Down Expand Up @@ -310,3 +310,5 @@ export const RoomList = () => {
</Layout>
);
};

export default RoomList;
11 changes: 5 additions & 6 deletions src/routes/config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@ import { RouteObject } from 'react-router-dom';
import { useRoutes } from 'react-router-dom';

import { Page404, To404 } from '@/404';
// import Devtools from '@/pages/Devtools';
import { Layouts } from '@/pages/Layouts';
import { Home } from '@/pages/Home';
import React from 'react';
import { RoomList } from '@/pages/RoomList';
import { Docs } from '@/pages/Docs';
import { Replay } from '@/pages/Replay';
import { LogList } from '@/pages/LogList';
import { ReplayLabs } from '@/pages/ReplayLabs';

const Devtools = React.lazy(() => import('@/pages/Devtools'));
const RoomList = React.lazy(() => import('@/pages/RoomList'));
const Docs = React.lazy(() => import('@/pages/Docs'));
const Replay = React.lazy(() => import('@/pages/Replay'));
const LogList = React.lazy(() => import('@/pages/LogList'));
const ReplayLabs = React.lazy(() => import('@/pages/ReplayLabs'));

export interface RouteInfo {
icon?: any;
Expand Down
9 changes: 9 additions & 0 deletions vite.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ export default ({ mode, command }) => {
target: ['chrome100'],
sourcemap: isProd ? 'hidden' : true,
outDir: isDoc ? 'docs-dist' : 'dist',
rollupOptions: {
output: {
manualChunks: {
react: ['react'],
'react-dom': ['react-dom'],
'react-router-dom': ['react-router-dom'],
},
},
},
},
resolve: {
alias: [{ find: '@', replacement: path.join(__dirname, './src') }],
Expand Down

0 comments on commit db3d144

Please sign in to comment.