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

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/server.d.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from 'express';
+import type { RequestHandler } from '@umijs/bundler-utils/compiled/express';
 export interface IOpts {
     base: string;
     routes: Record<string, {
@@ -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

@@ -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,13 +94,20 @@ 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) {
+        var _a;
+        if (opts.historyType === 'browser' &&
+            opts.base !== '/' &&
+            req.path === '/') {
+            // 如果是 browser，并且配置了非 / base，访问 / 时 redirect 到 base 路径
+            res.redirect(opts.base);
+        }
+        else if ((_a = req.headers.accept) === null || _a === void 0 ? void 0 : _a.includes('text/html')) {
+            // 匹配路由，不匹配走 next()
+            // 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-rc.1",
+  "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,13 +20,11 @@
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "history": "5.1.0",
-    "react": "18.0.0-rc.0",
-    "react-dom": "18.0.0-rc.0",
-    "react-router-dom": "6.1.1"
-  },
-  "devDependencies": {
-    "@types/express": "4.17.13"
+    "@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.3.0"
   },
   "publishConfig": {
     "access": "public"