@umijs/server 4.0.0-rc.11 → 4.0.0-rc.12

package/dist/server.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRequestHandler = exports.getMarkup = void 0;
 const react_1 = __importDefault(require("react"));
 const server_1 = __importDefault(require("react-dom/server"));
-const react_router_dom_1 = require("react-router-dom");
-const routes_1 = require("./routes");
+// import { matchRoutes } from 'react-router-dom';
+// import { createServerRoutes } from './routes';
 const scripts_1 = require("./scripts");
 const styles_1 = require("./styles");
 function getMarkup(opts) {
@@ -94,35 +94,26 @@ function getMarkup(opts) {
 exports.getMarkup = getMarkup;
 function createRequestHandler(opts) {
     return (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-        // TODO: cache
-        let isMatch;
-        if (opts.historyType === 'hash') {
-            // 如果是 hash 路由时，不做路由匹配，只要是 / 就匹配返回 html
-            isMatch = req.path === '/';
+        var _a;
+        if (opts.historyType === 'browser' &&
+            opts.base !== '/' &&
+            req.path === '/') {
+            // 如果是 browser，并且配置了非 / base，访问 / 时 redirect 到 base 路径
+            res.redirect(opts.base);
         }
-        else {
+        else if ((_a = req.headers.accept) === null || _a === void 0 ? void 0 : _a.includes('text/html')) {
             // 匹配路由，不匹配走 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) {
+            // const routes = createServerRoutes({
+            //   routesById: opts.routes,
+            // });
+            // const matches = matchRoutes(routes, req.path, opts.base);
+            // 其他接受 HTML 的请求都兜底返回 HTML
             res.set('Content-Type', 'text/html');
             const markup = yield getMarkup(Object.assign(Object.assign({}, opts), { path: req.path }));
             res.end(markup);
         }
         else {
-            // 如果是 browser，并且配置了非 / base，访问 / 时 redirect 到 base 路径
-            if (opts.historyType === 'browser' &&
-                opts.base !== '/' &&
-                req.path === '/') {
-                res.redirect(opts.base);
-            }
-            else {
-                next();
-            }
+            next();
         }
     });
 }

package/package.json

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