@umijs/server 4.0.0-canary.20220325.1 → 4.0.0-rc.11

package/dist/server.d.ts

@@ -18,6 +18,7 @@ export interface IOpts {
     modifyHTML?: (html: string, args: {
         path?: string;
     }) => Promise<string>;
+    historyType?: 'hash' | 'browser';
 }
 export declare function getMarkup(opts: Omit<IOpts, 'routes'> & {
     path?: string;

package/dist/server.js

@@ -94,19 +94,35 @@ function getMarkup(opts) {
 exports.getMarkup = getMarkup;
 function createRequestHandler(opts) {
     return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-        // 匹配路由，不匹配走 next()
         // TODO: cache
-        const routes = (0, routes_1.createServerRoutes)({
-            routesById: opts.routes,
-        });
-        const matches = (0, react_router_dom_1.matchRoutes)(routes, req.path, opts.base);
-        if (matches) {
+        let isMatch;
+        if (opts.historyType === 'hash') {
+            // 如果是 hash 路由时，不做路由匹配，只要是 / 就匹配返回 html
+            isMatch = req.path === '/';
+        }
+        else {
+            // 匹配路由，不匹配走 next()
+            const routes = (0, routes_1.createServerRoutes)({
+                routesById: opts.routes,
+            });
+            const matches = (0, react_router_dom_1.matchRoutes)(routes, req.path, opts.base);
+            isMatch = !!matches;
+        }
+        if (isMatch) {
             res.set('Content-Type', 'text/html');
             const markup = yield getMarkup(Object.assign(Object.assign({}, opts), { path: req.path }));
             res.end(markup);
         }
         else {
-            next();
+            // 如果是 browser，并且配置了非 / base，访问 / 时 redirect 到 base 路径
+            if (opts.historyType === 'browser' &&
+                opts.base !== '/' &&
+                req.path === '/') {
+                res.redirect(opts.base);
+            }
+            else {
+                next();
+            }
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-canary.20220325.1",
+  "version": "4.0.0-rc.11",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -20,7 +20,7 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-canary.20220325.1",
+    "@umijs/bundler-utils": "4.0.0-rc.11",
     "history": "5.3.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",