npm - @umijs/server - Versions diffs - 4.0.0-beta.1 → 4.0.0-beta.5 - Mend

@umijs/server 4.0.0-beta.1 → 4.0.0-beta.5

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 (5) hide show

package/dist/server.d.ts CHANGED Viewed

@@ -6,15 +6,19 @@ interface IOpts {
         id: string;
         parentId?: string;
     }>;
-    config: Record<string, any>;
-    scripts: string[];
+    links?: Record<string, string>[];
+    metas?: Record<string, string>[];
+    styles?: (Record<string, string> | string)[];
+    favicon?: string;
+    headScripts?: (Record<string, string> | string)[];
+    scripts?: (Record<string, string> | string)[];
     esmScript?: boolean;
     modifyHTML?: (opts: {
         html: string;
         path?: string;
     }) => Promise<string>;
 }
-export declare function getMarkup(opts: Pick<IOpts, 'scripts' | 'esmScript' | 'modifyHTML' | 'config'> & {
+export declare function getMarkup(opts: Omit<IOpts, 'routes'> & {
     path?: string;
 }): Promise<string>;
 export declare function createRequestHandler(opts: IOpts): RequestHandler;

package/dist/server.js CHANGED Viewed

@@ -18,20 +18,49 @@ const server_1 = __importDefault(require("react-dom/server"));
 const react_router_dom_1 = require("react-router-dom");
 const routes_1 = require("./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"' : ''} src='${script.src}'></script>`
-                : `<script${opts.esmScript ? ' type="module"' : ''}>${script.content}</script>`;
+                ? `<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.config.favicon
-            ? `<link rel="shortcut icon" href="${opts.config.favicon}">`
+        const favicon = opts.favicon
+            ? `<link rel="shortcut icon" href="${opts.favicon}">`
             : '';
-        const headScripts = (0, scripts_1.normalizeScripts)(opts.config.headScripts || []).map(getScriptContent);
-        const scripts = (0, scripts_1.normalizeScripts)(opts.scripts.concat(opts.config.scripts || [])).map(getScriptContent);
+        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>
@@ -42,7 +71,10 @@ 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>
 <body>`,

package/dist/styles.d.ts ADDED Viewed

@@ -0,0 +1,12 @@
+export declare type IStyle = string | {
+    src?: string;
+    content?: string;
+};
+export declare function normalizeStyles(scripts: IStyle[]): {
+    src?: string | undefined;
+    content?: string | undefined;
+}[];
+export declare function normalizeStyle(style: IStyle): {
+    src?: string | undefined;
+    content?: string | undefined;
+};

package/dist/styles.js ADDED Viewed

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeStyle = exports.normalizeStyles = void 0;
+const assert_1 = __importDefault(require("assert"));
+function normalizeStyles(scripts) {
+    return scripts.map(normalizeStyle);
+}
+exports.normalizeStyles = normalizeStyles;
+const RE_URL = /^(http:|https:)?\/\//;
+function normalizeStyle(style) {
+    if (typeof style === 'string') {
+        const isUrl = RE_URL.test(style) ||
+            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}`);
+    }
+}
+exports.normalizeStyle = normalizeStyle;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.5",
   "description": "@umijs/server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",