fix(router): basename

shuvijs · Dec 26, 2023 · 3f301b7 · 3f301b7
1 parent 6568a2c
commit 3f301b7
Show file tree

Hide file tree

Showing 33 changed files with 760 additions and 377 deletions.
diff --git a/packages/platform-web/src/node/features/html-render/lib/renderer/spa.ts b/packages/platform-web/src/node/features/html-render/lib/renderer/spa.ts
@@ -4,9 +4,13 @@ import { IRenderViewOptions, IHtmlDocument } from './types';
 export class SpaRenderer extends BaseRenderer {
   renderDocument({ req, app }: IRenderViewOptions) {
     const assets = this._getMainAssetTags(req);
+    const {
+      router: { basename }
+    } = this._serverPluginContext.appConfig;
     const appData: AppData = {
       ssr: false,
-      pageData: {}
+      pageData: {},
+      basename
     };
     const document: IHtmlDocument = {
       htmlAttrs: {},

diff --git a/packages/platform-web/src/shuvi-app/app/client.ts b/packages/platform-web/src/shuvi-app/app/client.ts
@@ -41,15 +41,14 @@ export const createApp: CreateAppClient = ({
   const { appState, ssr, basename } = appData;
   let history: History;
   if (historyMode === 'hash') {
-    history = createHashHistory();
+    history = createHashHistory({ basename });
   } else {
-    history = createBrowserHistory();
+    history = createBrowserHistory({ basename });
   }
 
   const router = createRouter({
     history,
-    routes: getRoutes(routes),
-    basename
+    routes: getRoutes(routes)
   });
 
   app = application({

diff --git a/packages/platform-web/src/shuvi-app/app/server.ts b/packages/platform-web/src/shuvi-app/app/server.ts
@@ -24,12 +24,12 @@ export const createApp: CreateAppServer = options => {
   const { req, ssr, basename } = options;
   const history = createMemoryHistory({
     initialEntries: [(req && req.url) || '/'],
-    initialIndex: 0
+    initialIndex: 0,
+    basename
   });
   const router = createRouter({
     history,
-    routes: getRoutes(routes),
-    basename
+    routes: getRoutes(routes)
   }) as IRouter;
   let app: InternalApplication;
   if (ssr) {

diff --git a/packages/platform-web/src/shuvi-app/react/view/ReactView.server.tsx b/packages/platform-web/src/shuvi-app/react/view/ReactView.server.tsx
@@ -47,7 +47,7 @@ export class ReactServerView implements IReactServerView {
         );
       }
       // handle router internal redirect
-      return redirect(pathname);
+      return redirect(router.resolve(router.current).href);
     }
 
     const loadableModules: string[] = [];

diff --git a/packages/router-react/src/MemoryRouter.tsx b/packages/router-react/src/MemoryRouter.tsx
@@ -18,9 +18,8 @@ export function MemoryRouter({
   let routerRef = React.useRef<IRouter>();
   if (routerRef.current == null) {
     routerRef.current = createRouter({
-      basename,
       routes: routes || [],
-      history: createMemoryHistory({ initialEntries, initialIndex })
+      history: createMemoryHistory({ initialEntries, initialIndex, basename })
     }).init();
   }
 

diff --git a/packages/router-react/src/__tests__/useHref-basename.test.js b/packages/router-react/src/__tests__/useHref-basename.test.js
@@ -188,7 +188,7 @@ describe('useHref under a <Routes basename>', () => {
         </Router>
       );
 
-      expect(href).toBe('/app');
+      expect(href).toBe('/app/');
     });
 
     describe('when the URL has a trailing slash', () => {
@@ -214,7 +214,7 @@ describe('useHref under a <Routes basename>', () => {
           </Router>
         );
 
-        expect(href).toBe('/app');
+        expect(href).toBe('/app/');
       });
     });
 
@@ -250,7 +250,7 @@ describe('useHref under a <Routes basename>', () => {
     it('returns the correct href', () => {
       let href;
       function Admin() {
-        href = useHref('../../../dashboard');
+        href = useHref('../../dashboard');
         return <h1>Admin</h1>;
       }
 
@@ -269,7 +269,7 @@ describe('useHref under a <Routes basename>', () => {
         </Router>
       );
 
-      expect(href).toBe('/dashboard');
+      expect(href).toBe('/app/dashboard');
     });
 
     describe('and no additional segments', () => {
@@ -295,15 +295,15 @@ describe('useHref under a <Routes basename>', () => {
           </Router>
         );
 
-        expect(href).toBe('/');
+        expect(href).toBe('/app/');
       });
     });
 
     describe('when the URL has a trailing slash', () => {
       it('returns the correct href', () => {
         let href;
         function Admin() {
-          href = useHref('../../../dashboard');
+          href = useHref('../../dashboard');
           return <h1>Admin</h1>;
         }
 
@@ -322,15 +322,15 @@ describe('useHref under a <Routes basename>', () => {
           </Router>
         );
 
-        expect(href).toBe('/dashboard');
+        expect(href).toBe('/app/dashboard');
       });
     });
 
     describe('when the href has a trailing slash', () => {
       it('returns the correct href', () => {
         let href;
         function Admin() {
-          href = useHref('../../../dashboard/');
+          href = useHref('../../dashboard/');
           return <h1>Admin</h1>;
         }
 
@@ -349,7 +349,7 @@ describe('useHref under a <Routes basename>', () => {
           </Router>
         );
 
-        expect(href).toBe('/dashboard/');
+        expect(href).toBe('/app/dashboard/');
       });
     });
   });

diff --git a/packages/router-react/src/__tests__/useHref.test.js b/packages/router-react/src/__tests__/useHref.test.js
@@ -235,6 +235,56 @@ describe('useHref', () => {
         expect(href).toBe('/courses/');
       });
     });
+
+    describe('when up to root route, href should always be root /', () => {
+      it('when href has no trailing slash', () => {
+        let href;
+        function AdvancedReact() {
+          href = useHref('..');
+          return <h1>Advanced React</h1>;
+        }
+
+        createTestRenderer(
+          <Router
+            initialEntries={['/courses']}
+            routes={[
+              {
+                path: 'courses',
+                component: AdvancedReact
+              }
+            ]}
+          >
+            <RouterView />
+          </Router>
+        );
+
+        expect(href).toBe('/');
+      });
+
+      it('when href has a trailing slash', () => {
+        let href;
+        function AdvancedReact() {
+          href = useHref('../');
+          return <h1>Advanced React</h1>;
+        }
+
+        createTestRenderer(
+          <Router
+            initialEntries={['/courses']}
+            routes={[
+              {
+                path: 'courses',
+                component: AdvancedReact
+              }
+            ]}
+          >
+            <RouterView />
+          </Router>
+        );
+
+        expect(href).toBe('/');
+      });
+    });
   });
 
   describe('with a to value that has more .. segments than are in the URL', () => {
@@ -277,6 +327,56 @@ describe('useHref', () => {
       expect(href).toBe('/courses');
     });
 
+    describe('when up to root route, href should always be root /', () => {
+      it('when href has no trailing slash', () => {
+        let href;
+        function AdvancedReact() {
+          href = useHref('../..');
+          return <h1>Advanced React</h1>;
+        }
+
+        createTestRenderer(
+          <Router
+            initialEntries={['/courses/some-path']}
+            routes={[
+              {
+                path: 'courses/some-path',
+                component: AdvancedReact
+              }
+            ]}
+          >
+            <RouterView />
+          </Router>
+        );
+
+        expect(href).toBe('/');
+      });
+
+      it('when href has a trailing slash', () => {
+        let href;
+        function AdvancedReact() {
+          href = useHref('../../');
+          return <h1>Advanced React</h1>;
+        }
+
+        createTestRenderer(
+          <Router
+            initialEntries={['/courses/some-path']}
+            routes={[
+              {
+                path: 'courses/some-path',
+                component: AdvancedReact
+              }
+            ]}
+          >
+            <RouterView />
+          </Router>
+        );
+
+        expect(href).toBe('/');
+      });
+    });
+
     describe('and no additional segments', () => {
       it('links to the root /', () => {
         let href;

diff --git a/packages/router/src/__tests__/matchRoutes.test.ts b/packages/router/src/__tests__/matchRoutes.test.ts
@@ -123,7 +123,9 @@ describe('path matching', () => {
     expect(pickPaths(routes, '/groups/main')).toEqual(['/groups/main']);
     expect(pickPaths(routes, '/groups/123')).toEqual(['/groups/:groupId']);
     expect(pickPaths(routes, '/groups')).toEqual(['/groups']);
-    expect(pickPaths(routes, '/files/some/long/path')).toEqual(['/files/:_other(.*)']);
+    expect(pickPaths(routes, '/files/some/long/path')).toEqual([
+      '/files/:_other(.*)'
+    ]);
     expect(pickPaths(routes, '/files')).toEqual(['/files']);
     expect(pickPaths(routes, '/one/two/three/four/five')).toEqual([
       '/:one/:two/:three/:four/:five'