Update types

ije · ije · commit ec86dba2ef49 · 2021-08-25T22:36:24.000+08:00
diff --git a/server/aleph.ts b/server/aleph.ts
@@ -640,7 +640,7 @@ export class Aleph implements IAleph {
     for (const callback of this.#renderListeners) {
       callback({ path: url.toString(), html, data })
     }
-    return [buildHtml(html), data]
+    return [buildHtml(html, !this.isDev), data]
   }
 
   /** create a fs watcher.  */
@@ -720,12 +720,12 @@ export class Aleph implements IAleph {
       headElements: [],
       scripts: this.getScripts(),
       body: '<div id="__aleph"></div>',
-      minify: !this.isDev
+      bodyAttrs: {},
     }
     for (const callback of this.#renderListeners) {
       await callback({ path: 'spa-index-html', html, data: null })
     }
-    return buildHtml(html)
+    return buildHtml(html, !this.isDev)
   }
 
   /** get scripts for html output */
diff --git a/server/renderer.ts b/server/renderer.ts
@@ -147,7 +147,7 @@ export class Renderer {
           })
         ],
         body: `<div id="__aleph">${body}</div>`,
-        minify: !isDev
+        bodyAttrs: {}
       },
       data
     ]
@@ -176,15 +176,14 @@ export class Renderer {
 /** build html content by given descriptor */
 export function buildHtml({
   body,
+  bodyAttrs = {},
   lang = 'en',
-  headElements: head = [],
-  bodyClassName: className,
-  scripts = [],
-  minify = false
-}: HtmlDescriptor) {
+  headElements = [],
+  scripts = []
+}: HtmlDescriptor, minify = false) {
   const eol = minify ? '' : '\n'
   const indent = minify ? '' : ' '.repeat(2)
-  const headTags = head.map(tag => tag.trim()).concat(scripts.map(v => {
+  const headTags = headElements.map(tag => tag.trim()).concat(scripts.map(v => {
     if (!util.isString(v) && util.isFilledString(v.src)) {
       if (v.type === 'module') {
         return `<link rel="modulepreload" href=${JSON.stringify(v.src)} />`
@@ -207,7 +206,7 @@ export function buildHtml({
     }
   }).filter(Boolean)
 
-  if (!head.some(tag => tag.trimLeft().startsWith('<meta') && tag.includes('name="viewport"'))) {
+  if (!headElements.some(tag => tag.trimLeft().startsWith('<meta') && tag.includes('name="viewport"'))) {
     headTags.unshift('<meta name="viewport" content="width=device-width" />')
   }
 
@@ -218,7 +217,7 @@ export function buildHtml({
     indent + '<meta charSet="utf-8" />',
     ...headTags.map(tag => indent + tag),
     '</head>',
-    className ? `<body class="${className}">` : '<body>',
+    `<body${formatAttrs(bodyAttrs)}>`,
     indent + body,
     ...scriptTags.map(tag => indent + tag),
     '</body>',
diff --git a/types.d.ts b/types.d.ts
@@ -119,12 +119,11 @@ type DependencyDescriptor = {
 
 /** The HTML Descriptor. */
 type HtmlDescriptor = {
-  lang?: string,
-  headElements?: string[],
-  body?: string,
-  bodyClassName?: string,
-  scripts?: (string | { id?: string, type?: string, src?: string, innerText?: string, async?: boolean, preload?: boolean, nomodule?: boolean })[],
-  minify?: boolean
+  lang: string,
+  headElements: string[],
+  scripts: (string | { id?: string, type?: string, src?: string, innerText?: string, async?: boolean, preload?: boolean, nomodule?: boolean })[],
+  body: string,
+  bodyAttrs: Record<string, string>,
 }
 
 /** SSR data with expires. */

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ export class Aleph implements IAleph {`
`640`	`640`	`for (const callback of this.#renderListeners) {`
`641`	`641`	`callback({ path: url.toString(), html, data })`
`642`	`642`	`}`
`643`		`- return [buildHtml(html), data]`
	`643`	`+ return [buildHtml(html, !this.isDev), data]`
`644`	`644`	`}`
`645`	`645`
`646`	`646`	`/** create a fs watcher. */`
`@@ -720,12 +720,12 @@ export class Aleph implements IAleph {`
`720`	`720`	`headElements: [],`
`721`	`721`	`scripts: this.getScripts(),`
`722`	`722`	`body: '<div id="__aleph"></div>',`
`723`		`- minify: !this.isDev`
	`723`	`+ bodyAttrs: {},`
`724`	`724`	`}`
`725`	`725`	`for (const callback of this.#renderListeners) {`
`726`	`726`	`await callback({ path: 'spa-index-html', html, data: null })`
`727`	`727`	`}`
`728`		`- return buildHtml(html)`
	`728`	`+ return buildHtml(html, !this.isDev)`
`729`	`729`	`}`
`730`	`730`
`731`	`731`	`/** get scripts for html output */`