npm - @umijs/server - Versions diffs - 4.0.6 → 4.0.9 - Mend

@umijs/server 4.0.6 → 4.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/index.js CHANGED Viewed

@@ -1,20 +1,31 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = 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];
-}));
-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);
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-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);
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// index.ts
+var src_exports = {};
+__export(src_exports, {
+  createServerRoutes: () => import_routes.createServerRoutes
+});
+module.exports = __toCommonJS(src_exports);
+var import_routes = require("./routes");
+__reExport(src_exports, require("./server"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createServerRoutes
+});

package/dist/routes.js CHANGED Viewed

@@ -1,32 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerRoute = exports.createServerRoutes = void 0;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// routes.ts
+var routes_exports = {};
+__export(routes_exports, {
+  createServerRoute: () => createServerRoute,
+  createServerRoutes: () => createServerRoutes
+});
+module.exports = __toCommonJS(routes_exports);
 function createServerRoutes(opts) {
-    const { routesById, parentId } = opts;
-    return Object.keys(routesById)
-        .filter((id) => routesById[id].parentId === parentId)
-        .map((id) => {
-        const route = createServerRoute({
-            route: routesById[id],
-        });
-        const children = createServerRoutes({
-            routesById,
-            parentId: route.id,
-        });
-        if (children.length > 0) {
-            // @ts-ignore
-            route.children = children;
-        }
-        return route;
+  const { routesById, parentId } = opts;
+  return Object.keys(routesById).filter((id) => routesById[id].parentId === parentId).map((id) => {
+    const route = createServerRoute({
+      route: routesById[id]
     });
+    const children = createServerRoutes({
+      routesById,
+      parentId: route.id
+    });
+    if (children.length > 0) {
+      route.children = children;
+    }
+    return route;
+  });
 }
-exports.createServerRoutes = createServerRoutes;
 function createServerRoute(opts) {
-    const { route } = opts;
-    return {
-        id: route.id,
-        path: route.path,
-        index: route.index,
-    };
+  const { route } = opts;
+  return {
+    id: route.id,
+    path: route.path,
+    index: route.index
+  };
 }
-exports.createServerRoute = createServerRoute;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createServerRoute,
+  createServerRoutes
+});

package/dist/scripts.js CHANGED Viewed

@@ -1,33 +1,51 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeScript = exports.normalizeScripts = void 0;
-const assert_1 = __importDefault(require("assert"));
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// scripts.ts
+var scripts_exports = {};
+__export(scripts_exports, {
+  normalizeScript: () => normalizeScript,
+  normalizeScripts: () => normalizeScripts
+});
+module.exports = __toCommonJS(scripts_exports);
+var import_assert = __toESM(require("assert"));
 function normalizeScripts(scripts) {
-    return scripts.map(normalizeScript);
+  return scripts.map(normalizeScript);
 }
-exports.normalizeScripts = normalizeScripts;
-const RE_URL = /^(http:|https:)?\/\//;
+var 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('../');
-        return isUrl
-            ? {
-                src: script,
-            }
-            : { content: script };
-    }
-    else if (typeof script === 'object') {
-        (0, assert_1.default)(typeof script.src === 'string' || typeof script.content === 'string', `Script must have either a "src" or a "content" property.`);
-        return script;
-    }
-    else {
-        throw new Error(`Invalid script type: ${typeof script}`);
-    }
+  if (typeof script === "string") {
+    const isUrl = RE_URL.test(script) || script.startsWith("/") && !script.startsWith("/*") || script.startsWith("./") || script.startsWith("../");
+    return isUrl ? {
+      src: script
+    } : { content: script };
+  } else if (typeof script === "object") {
+    (0, import_assert.default)(typeof script.src === "string" || typeof script.content === "string", `Script must have either a "src" or a "content" property.`);
+    return script;
+  } else {
+    throw new Error(`Invalid script type: ${typeof script}`);
+  }
 }
-exports.normalizeScript = normalizeScript;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  normalizeScript,
+  normalizeScripts
+});

package/dist/server.js CHANGED Viewed

@@ -1,114 +1,145 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
 };
-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"));
-// import { matchRoutes } from 'react-router-dom';
-// import { createServerRoutes } from './routes';
-const scripts_1 = require("./scripts");
-const styles_1 = require("./styles");
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// server.ts
+var server_exports = {};
+__export(server_exports, {
+  createRequestHandler: () => createRequestHandler,
+  getMarkup: () => getMarkup
+});
+module.exports = __toCommonJS(server_exports);
+var import_react = __toESM(require("react"));
+var import_server = __toESM(require("react-dom/server"));
+var import_scripts = require("./scripts");
+var import_styles = require("./styles");
 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 favicons = [];
-    if (Array.isArray(opts.favicons)) {
-        opts.favicons.forEach((e) => {
-            favicons.push(`<link rel="shortcut icon" href="${e}">`);
-        });
-    }
-    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>
+  let markup = import_server.default.renderToString(import_react.default.createElement("div", { id: opts.mountElementId || "root" }));
+  function propsToString(opts2) {
+    return Object.keys(opts2.props).filter((key) => !(opts2.filters || []).includes(key)).map((key) => `${key}=${JSON.stringify(opts2.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(opts2) {
+    const attrs = propsToString({
+      props: opts2.attrs
+    });
+    return `<${opts2.tagName} ${attrs} />`;
+  }
+  function withDefaultMetas(metas2 = []) {
+    const hasAttr = (key, value) => metas2.some((m) => {
+      var _a;
+      return value ? ((_a = m[key]) == null ? void 0 : _a.toLowerCase()) === value.toLowerCase() : m[key];
+    });
+    return [
+      !hasAttr("charset") && { charset: "utf-8" },
+      !hasAttr("name", "viewport") && {
+        name: "viewport",
+        content: "width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+      },
+      !hasAttr("http-equiv", "X-UA-Compatible") && {
+        "http-equiv": "X-UA-Compatible",
+        content: "ie=edge"
+      },
+      ...metas2
+    ].filter(Boolean);
+  }
+  const favicons = [];
+  if (Array.isArray(opts.favicons)) {
+    opts.favicons.forEach((e) => {
+      favicons.push(`<link rel="shortcut icon" href="${e}">`);
+    });
+  }
+  const title = opts.title ? `<title>${opts.title}</title>` : "";
+  const metas = withDefaultMetas(opts.metas).map((meta) => getTagContent({ attrs: meta, tagName: "meta" }));
+  const links = (opts.links || []).map((link) => getTagContent({ attrs: link, tagName: "link" }));
+  const styles = (0, import_styles.normalizeStyles)(opts.styles || []).map(getStyleContent);
+  const headScripts = (0, import_scripts.normalizeScripts)(opts.headScripts || []).map(getScriptContent);
+  const scripts = (0, import_scripts.normalizeScripts)(opts.scripts || []).map(getScriptContent);
+  markup = [
+    `<!DOCTYPE html>
 <html>
-<head>
-<meta charset="UTF-8" />
-<meta
-  name="viewport"
-  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'),
-        favicons.join('\n'),
-        title,
-        links.join('\n'),
-        styles.join('\n'),
-        headScripts.join('\n'),
-        `</head>
+<head>`,
+    metas.join("\n"),
+    favicons.join("\n"),
+    title,
+    links.join("\n"),
+    styles.join("\n"),
+    headScripts.join("\n"),
+    `</head>
 <body>`,
-        markup,
-        scripts.join('\n'),
-        `</body>
-</html>`,
-    ]
-        .filter(Boolean)
-        .join('\n');
-    if (opts.modifyHTML) {
-        markup = await opts.modifyHTML(markup, { path: opts.path });
-    }
-    return markup;
+    markup,
+    scripts.join("\n"),
+    `</body>
+</html>`
+  ].filter(Boolean).join("\n");
+  if (opts.modifyHTML) {
+    markup = await opts.modifyHTML(markup, { path: opts.path });
+  }
+  return markup;
 }
-exports.getMarkup = getMarkup;
 function createRequestHandler(opts) {
-    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 = await getMarkup({ ...opts, path: req.path });
-            res.end(markup);
-        }
-        else {
-            next();
-        }
-    };
+  return async (req, res, next) => {
+    var _a;
+    if (opts.historyType === "browser" && opts.base !== "/" && req.path === "/") {
+      res.redirect(opts.base);
+    } else if (((_a = req.headers.accept) == null ? void 0 : _a.includes("text/html")) || req.headers.accept === "*/*" || req.path === opts.base) {
+      res.set("Content-Type", "text/html");
+      const markup = await getMarkup(__spreadProps(__spreadValues({}, opts), { path: req.path }));
+      res.end(markup);
+    } else {
+      next();
+    }
+  };
 }
-exports.createRequestHandler = createRequestHandler;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createRequestHandler,
+  getMarkup
+});

package/dist/ssr.js CHANGED Viewed

@@ -1,89 +1,111 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const server_1 = require("react-dom/server");
-const react_router_dom_1 = require("react-router-dom");
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// ssr.ts
+var ssr_exports = {};
+__export(ssr_exports, {
+  default: () => createRequestHandler
+});
+module.exports = __toCommonJS(ssr_exports);
+var import_server = require("react-dom/server");
+var import_react_router_dom = require("react-router-dom");
 function createRequestHandler(opts) {
-    return async function (req, res, next) {
-        const { routesWithServerLoader, PluginManager, getPlugins, getValidKeys, getRoutes, } = opts;
-        // 切换路由场景下，会通过此 API 执行 server loader
-        if (req.url.startsWith('/__serverLoader') && req.query.route) {
-            const data = await executeLoader(req.query.route, routesWithServerLoader);
-            res.status(200).json(data);
-            return;
-        }
-        const pluginManager = PluginManager.create({
-            plugins: getPlugins(),
-            validKeys: getValidKeys(),
-        });
-        const { routes, routeComponents } = await getRoutes(pluginManager);
-        const matches = matchRoutesForSSR(req.url, routes);
-        if (matches.length === 0) {
-            return next();
-        }
-        const loaderData = {};
-        await Promise.all(matches
-            .filter((id) => routes[id].hasServerLoader)
-            .map((id) => new Promise(async (resolve) => {
-            loaderData[id] = await executeLoader(id, routesWithServerLoader);
-            resolve();
-        })));
-        const manifest = typeof opts.manifest === 'function' ? opts.manifest() : opts.manifest;
-        const context = {
-            routes,
-            routeComponents,
-            pluginManager,
-            location: req.url,
-            manifest,
-            loaderData,
-        };
-        const jsx = await opts.getClientRootComponent(context);
-        const stream = (0, server_1.renderToPipeableStream)(jsx, {
-            bootstrapScripts: [manifest.assets['umi.js'] || '/umi.js'],
-            onShellReady() {
-                res.setHeader('Content-type', 'text/html');
-                stream.pipe(res);
-            },
-            onError(x) {
-                console.error(x);
-            },
-        });
+  return async function(req, res, next) {
+    const {
+      routesWithServerLoader,
+      PluginManager,
+      getPlugins,
+      getValidKeys,
+      getRoutes
+    } = opts;
+    if (req.url.startsWith("/__serverLoader") && req.query.route) {
+      const data = await executeLoader(req.query.route, routesWithServerLoader);
+      res.status(200).json(data);
+      return;
+    }
+    const pluginManager = PluginManager.create({
+      plugins: getPlugins(),
+      validKeys: getValidKeys()
+    });
+    const { routes, routeComponents } = await getRoutes(pluginManager);
+    const matches = matchRoutesForSSR(req.url, routes);
+    if (matches.length === 0) {
+      return next();
+    }
+    const loaderData = {};
+    await Promise.all(matches.filter((id) => routes[id].hasServerLoader).map((id) => new Promise(async (resolve) => {
+      loaderData[id] = await executeLoader(id, routesWithServerLoader);
+      resolve();
+    })));
+    const manifest = typeof opts.manifest === "function" ? opts.manifest() : opts.manifest;
+    const context = {
+      routes,
+      routeComponents,
+      pluginManager,
+      location: req.url,
+      manifest,
+      loaderData
     };
+    const jsx = await opts.getClientRootComponent(context);
+    const stream = (0, import_server.renderToPipeableStream)(jsx, {
+      bootstrapScripts: [manifest.assets["umi.js"] || "/umi.js"],
+      onShellReady() {
+        res.setHeader("Content-type", "text/html");
+        stream.pipe(res);
+      },
+      onError(x) {
+        console.error(x);
+      }
+    });
+  };
 }
-exports.default = createRequestHandler;
 function matchRoutesForSSR(reqUrl, routesById) {
-    var _a;
-    return (((_a = (0, react_router_dom_1.matchRoutes)(createClientRoutes({ routesById }), reqUrl)) === null || _a === void 0 ? void 0 : _a.map((route) => route.route.id)) || []);
+  var _a;
+  return ((_a = (0, import_react_router_dom.matchRoutes)(createClientRoutes({ routesById }), reqUrl)) == null ? void 0 : _a.map((route) => route.route.id)) || [];
 }
 function createClientRoutes(opts) {
-    const { routesById, parentId } = opts;
-    return Object.keys(routesById)
-        .filter((id) => routesById[id].parentId === parentId)
-        .map((id) => {
-        const route = createClientRoute(routesById[id]);
-        const children = createClientRoutes({
-            routesById,
-            parentId: route.id,
-        });
-        if (children.length > 0) {
-            // @ts-ignore
-            route.children = children;
-        }
-        return route;
+  const { routesById, parentId } = opts;
+  return Object.keys(routesById).filter((id) => routesById[id].parentId === parentId).map((id) => {
+    const route = createClientRoute(routesById[id]);
+    const children = createClientRoutes({
+      routesById,
+      parentId: route.id
     });
+    if (children.length > 0) {
+      route.children = children;
+    }
+    return route;
+  });
 }
 function createClientRoute(route) {
-    const { id, path, index } = route;
-    return {
-        id,
-        path,
-        index,
-    };
+  const { id, path, index } = route;
+  return {
+    id,
+    path,
+    index
+  };
 }
 async function executeLoader(routeKey, routesWithServerLoader) {
-    const mod = await routesWithServerLoader[routeKey]();
-    if (!mod.serverLoader || typeof mod.serverLoader !== 'function') {
-        return;
-    }
-    // TODO: 处理错误场景
-    return await mod.serverLoader();
+  const mod = await routesWithServerLoader[routeKey]();
+  if (!mod.serverLoader || typeof mod.serverLoader !== "function") {
+    return;
+  }
+  return await mod.serverLoader();
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/styles.js CHANGED Viewed

@@ -1,33 +1,51 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeStyle = exports.normalizeStyles = void 0;
-const assert_1 = __importDefault(require("assert"));
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// styles.ts
+var styles_exports = {};
+__export(styles_exports, {
+  normalizeStyle: () => normalizeStyle,
+  normalizeStyles: () => normalizeStyles
+});
+module.exports = __toCommonJS(styles_exports);
+var import_assert = __toESM(require("assert"));
 function normalizeStyles(scripts) {
-    return scripts.map(normalizeStyle);
+  return scripts.map(normalizeStyle);
 }
-exports.normalizeStyles = normalizeStyles;
-const RE_URL = /^(http:|https:)?\/\//;
+var 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('../');
-        return isUrl
-            ? {
-                src: style,
-            }
-            : { content: style };
-    }
-    else if (typeof style === 'object') {
-        (0, assert_1.default)(typeof style.src === 'string' || typeof style.content === 'string', `Style must have either a "src" or a "content" property.`);
-        return style;
-    }
-    else {
-        throw new Error(`Invalid style type: ${typeof style}`);
-    }
+  if (typeof style === "string") {
+    const isUrl = RE_URL.test(style) || style.startsWith("/") && !style.startsWith("/*") || style.startsWith("./") || style.startsWith("../");
+    return isUrl ? {
+      src: style
+    } : { content: style };
+  } else if (typeof style === "object") {
+    (0, import_assert.default)(typeof style.src === "string" || typeof style.content === "string", `Style must have either a "src" or a "content" property.`);
+    return style;
+  } else {
+    throw new Error(`Invalid style type: ${typeof style}`);
+  }
 }
-exports.normalizeStyle = normalizeStyle;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  normalizeStyle,
+  normalizeStyles
+});

package/dist/types.js CHANGED Viewed

@@ -1,2 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+// types.ts
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.6",
+  "version": "4.0.9",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -15,12 +15,12 @@
     "dist"
   ],
   "scripts": {
-    "build": "pnpm tsc",
+    "build": "umi-scripts father build",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build --watch"
+    "dev": "umi-scripts father dev"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.6",
+    "@umijs/bundler-utils": "4.0.9",
     "history": "5.3.0",
     "react": "18.1.0",
     "react-dom": "18.1.0",