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

package/dist/index.d.ts

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

package/dist/index.js

@@ -14,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/server.d.ts

@@ -11,6 +11,7 @@ export 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;

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 };
 };
@@ -19,50 +10,50 @@ const server_1 = __importDefault(require("react-dom/server"));
 // 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: 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 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,29 +62,29 @@ 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* () {
+    return async (req, res, next) => {
         var _a;
         if (opts.historyType === 'browser' &&
             opts.base !== '/' &&
@@ -109,12 +100,12 @@ function createRequestHandler(opts) {
             // 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-rc.12",
+  "version": "4.0.0-rc.15",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -16,14 +16,14 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-rc.12",
+    "@umijs/bundler-utils": "4.0.0-rc.15",
     "history": "5.3.0",
-    "react": "17.0.2",
-    "react-dom": "17.0.2",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
     "react-router-dom": "6.3.0"
   },
   "publishConfig": {