Skip to content

Commit

Permalink
chore: browser router
Browse files Browse the repository at this point in the history
  • Loading branch information
gary-Shen committed Nov 10, 2023
1 parent 8a4671c commit 7b5a57b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 18 deletions.
8 changes: 7 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
import { useEffect } from 'react';

import RouterContainer from '@/components/router-container';

import routes from './routes';

export default function App() {
return <RouterContainer routes={routes} basename="/labelU" />;
useEffect(() => {
document.dispatchEvent(new Event('custom-render-trigger'));
}, []);

return <RouterContainer routes={routes} />;
}
12 changes: 3 additions & 9 deletions src/components/router-container/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import React, { useEffect, useMemo } from 'react';
import type { RouteObject, UIMatch } from 'react-router-dom';
import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider, useMatches } from 'react-router-dom';
import { createHashRouter, createRoutesFromElements, Route, RouterProvider, useMatches } from 'react-router-dom';

export type RouteWithParent = RouteObject & {
parent: RouteWithParent | null;
Expand Down Expand Up @@ -66,14 +66,8 @@ export interface RouterProps {
basename?: string;
}

export default function RouterContainer({ routes, basename }: RouterProps) {
const router = useMemo(
() =>
createBrowserRouter(createRoutesFromElements(mapRoutes(routes)), {
basename,
}),
[routes, basename],
);
export default function RouterContainer({ routes }: RouterProps) {
const router = useMemo(() => createHashRouter(createRoutesFromElements(mapRoutes(routes))), [routes]);
const fallback = <div style={{ width: '100vw', marginTop: '40vh' }}> loading </div>;

return <RouterProvider router={router} fallbackElement={fallback} />;
Expand Down
10 changes: 2 additions & 8 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ViteEjsPlugin } from 'vite-plugin-ejs';

// https://vitejs.dev/config/
export default defineConfig({
base: '/labelU/',
base: '/',
publicDir: resolve(__dirname, 'public'),

optimizeDeps: {
Expand All @@ -22,17 +22,11 @@ export default defineConfig({
svgr(),
ViteEjsPlugin(),
// prerender({
// routes: ['/', '/guide/install/windows', '/guide/install/macos', '/schema/image/point'],
// routes: ['/', '/schema/image/point'],
// renderer: '@prerenderer/renderer-puppeteer',
// rendererOptions: {
// renderAfterDocumentEvent: 'custom-render-trigger',
// },
// postProcess(renderedRoute) {
// // Replace all http with https urls and localhost to your site url
// renderedRoute.html = renderedRoute.html
// .replace(/http:/i, 'https:')
// .replace(/(https:\/\/)?(localhost|127\.0\.0\.1):\d*/i, process.env.CI_ENVIRONMENT_URL || '');
// },
// }),
].filter(Boolean),
resolve: {
Expand Down

0 comments on commit 7b5a57b

Please sign in to comment.