@umijs/server 4.0.0-beta.9 → 4.0.0-canary.202200505.1

package/dist/index.d.ts

@@ -1 +1,2 @@
+export { createServerRoutes } from './routes';
 export * from './server';

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];
@@ -10,4 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createServerRoutes = void 0;
+var routes_1 = require("./routes");
+Object.defineProperty(exports, "createServerRoutes", { enumerable: true, get: function () { return routes_1.createServerRoutes; } });
 __exportStar(require("./server"), exports);

package/dist/scripts.js

@@ -13,7 +13,7 @@ const RE_URL = /^(http:|https:)?\/\//;
 function normalizeScript(script) {
     if (typeof script === 'string') {
         const isUrl = RE_URL.test(script) ||
-            script.startsWith('/') ||
+            (script.startsWith('/') && !script.startsWith('/*')) ||
             script.startsWith('./') ||
             script.startsWith('../');
         return isUrl

package/dist/server.d.ts

@@ -1,5 +1,6 @@
-import type { RequestHandler } from 'express';
-interface IOpts {
+import type { RequestHandler } from '@umijs/bundler-utils/compiled/express';
+export interface IOpts {
+    base: string;
     routes: Record<string, {
         path: string;
         file: string;
@@ -10,15 +11,17 @@ interface IOpts {
     metas?: Record<string, string>[];
     styles?: (Record<string, string> | string)[];
     favicon?: string;
+    title?: string;
     headScripts?: (Record<string, string> | string)[];
     scripts?: (Record<string, string> | string)[];
+    mountElementId?: string;
     esmScript?: boolean;
     modifyHTML?: (html: string, args: {
         path?: string;
     }) => Promise<string>;
+    historyType?: 'hash' | 'browser';
 }
 export declare function getMarkup(opts: Omit<IOpts, 'routes'> & {
     path?: string;
 }): Promise<string>;
 export declare function createRequestHandler(opts: IOpts): RequestHandler;
-export {};

package/dist/server.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,54 +6,54 @@ 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) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // TODO: use real component
-        let markup = server_1.default.renderToString(react_1.default.createElement('div', { id: 'root' }));
-        function propsToString(opts) {
-            return Object.keys(opts.props)
-                .filter((key) => !(opts.filters || []).includes(key))
-                .map((key) => `${key}=${JSON.stringify(opts.props[key])}`)
-                .join(' ');
-        }
-        function getScriptContent(script) {
-            const attrs = propsToString({
-                props: script,
-                filters: ['src', 'content'],
-            });
-            return script.src
-                ? `<script${opts.esmScript ? ' type="module"' : ''} ${attrs} src="${script.src}"></script>`
-                : `<script${opts.esmScript ? ' type="module"' : ''} ${attrs}>${script.content}</script>`;
-        }
-        function getStyleContent(style) {
-            const attrs = propsToString({
-                props: style,
-                filters: ['src', 'content'],
-            });
-            return style.src
-                ? `<link rel="stylesheet" ${attrs} src="${style.src}" />`
-                : `<style ${attrs}>${style.content}</style>`;
-        }
-        function getTagContent(opts) {
-            const attrs = propsToString({
-                props: opts.attrs,
-            });
-            return `<${opts.tagName} ${attrs} />`;
-        }
-        const favicon = opts.favicon
-            ? `<link rel="shortcut icon" href="${opts.favicon}">`
-            : '';
-        const metas = (opts.metas || []).map((meta) => getTagContent({ attrs: meta, tagName: 'meta' }));
-        const links = (opts.links || []).map((link) => getTagContent({ attrs: link, tagName: 'link' }));
-        const styles = (0, styles_1.normalizeStyles)(opts.styles || []).map(getStyleContent);
-        const headScripts = (0, scripts_1.normalizeScripts)(opts.headScripts || []).map(getScriptContent);
-        const scripts = (0, scripts_1.normalizeScripts)(opts.scripts || []).map(getScriptContent);
-        markup = [
-            `<!DOCTYPE html>
+async function getMarkup(opts) {
+    // TODO: use real component
+    let markup = server_1.default.renderToString(react_1.default.createElement('div', { id: opts.mountElementId || 'root' }));
+    function propsToString(opts) {
+        return Object.keys(opts.props)
+            .filter((key) => !(opts.filters || []).includes(key))
+            .map((key) => `${key}=${JSON.stringify(opts.props[key])}`)
+            .join(' ');
+    }
+    function getScriptContent(script) {
+        const attrs = propsToString({
+            props: script,
+            filters: ['src', 'content'],
+        });
+        return script.src
+            ? `<script${opts.esmScript ? ' type="module"' : ''} ${attrs} src="${script.src}"></script>`
+            : `<script${opts.esmScript ? ' type="module"' : ''} ${attrs}>${script.content}</script>`;
+    }
+    function getStyleContent(style) {
+        const attrs = propsToString({
+            props: style,
+            filters: ['src', 'content'],
+        });
+        return style.src
+            ? `<link rel="stylesheet" ${attrs} href="${style.src}" />`
+            : `<style ${attrs}>${style.content}</style>`;
+    }
+    function getTagContent(opts) {
+        const attrs = propsToString({
+            props: opts.attrs,
+        });
+        return `<${opts.tagName} ${attrs} />`;
+    }
+    const favicon = opts.favicon
+        ? `<link rel="shortcut icon" href="${opts.favicon}">`
+        : '';
+    const title = opts.title ? `<title>${opts.title}</title>` : '';
+    const metas = (opts.metas || []).map((meta) => getTagContent({ attrs: meta, tagName: 'meta' }));
+    const links = (opts.links || []).map((link) => getTagContent({ attrs: link, tagName: 'link' }));
+    const styles = (0, styles_1.normalizeStyles)(opts.styles || []).map(getStyleContent);
+    const headScripts = (0, scripts_1.normalizeScripts)(opts.headScripts || []).map(getScriptContent);
+    const scripts = (0, scripts_1.normalizeScripts)(opts.scripts || []).map(getScriptContent);
+    markup = [
+        `<!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8" />
@@ -71,43 +62,50 @@ function getMarkup(opts) {
   content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
 />
 <meta http-equiv="X-UA-Compatible" content="ie=edge" />`,
-            metas.join('\n'),
-            favicon,
-            links.join('\n'),
-            styles.join('\n'),
-            headScripts.join('\n'),
-            `</head>
+        metas.join('\n'),
+        favicon,
+        title,
+        links.join('\n'),
+        styles.join('\n'),
+        headScripts.join('\n'),
+        `</head>
 <body>`,
-            markup,
-            scripts.join('\n'),
-            `</body>
+        markup,
+        scripts.join('\n'),
+        `</body>
 </html>`,
-        ]
-            .filter(Boolean)
-            .join('\n');
-        if (opts.modifyHTML) {
-            markup = yield opts.modifyHTML(markup, { path: opts.path });
-        }
-        return markup;
-    });
+    ]
+        .filter(Boolean)
+        .join('\n');
+    if (opts.modifyHTML) {
+        markup = await opts.modifyHTML(markup, { path: opts.path });
+    }
+    return markup;
 }
 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);
-        if (matches) {
+    return async (req, res, next) => {
+        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 }));
+            const markup = await getMarkup({ ...opts, path: req.path });
             res.end(markup);
         }
         else {
             next();
         }
-    });
+    };
 }
 exports.createRequestHandler = createRequestHandler;

package/dist/styles.js

@@ -13,7 +13,7 @@ const RE_URL = /^(http:|https:)?\/\//;
 function normalizeStyle(style) {
     if (typeof style === 'string') {
         const isUrl = RE_URL.test(style) ||
-            style.startsWith('/') ||
+            (style.startsWith('/') && !style.startsWith('/*')) ||
             style.startsWith('./') ||
             style.startsWith('../');
         return isUrl

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-beta.9",
+  "version": "4.0.0-canary.202200505.1",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -16,17 +16,15 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "history": "5.0.1",
-    "react": "18.0.0-alpha-4298ddbc5-20211023",
-    "react-dom": "18.0.0-alpha-4298ddbc5-20211023",
-    "react-router-dom": "6.0.0-beta.8"
-  },
-  "devDependencies": {
-    "@types/express": "4.17.13"
+    "@umijs/bundler-utils": "4.0.0-canary.202200505.1",
+    "history": "5.3.0",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "react-router-dom": "6.3.0"
   },
   "publishConfig": {
     "access": "public"