refactor: improve custom scripts render

Author: Je

head.ts

@@ -48,14 +48,16 @@ export async function renderHead(styles?: { url: string, hash: string, async?: b
     return tags
 }
 
-export async function renderScripts() {
+export function renderScripts() {
     const scripts: Record<string, any>[] = []
     serverScriptsElements.forEach(({ props }) => {
-        const { children, ...attrs } = props
-        if (util.isNEString(children)) {
-            scripts.push({ ...attrs, innerText: unescape(children).trim() })
+        const { children, dangerouslySetInnerHTML, ...attrs } = props
+        if (dangerouslySetInnerHTML && util.isNEString(dangerouslySetInnerHTML.__html)) {
+            scripts.push({ ...attrs, innerText: dangerouslySetInnerHTML.__html })
+        } if (util.isNEString(children)) {
+            scripts.push({ ...attrs, innerText: unescape(children) })
         } else if (util.isNEArray(children)) {
-            scripts.push({ ...attrs, innerText: unescape(children.join('')).trim() })
+            scripts.push({ ...attrs, innerText: unescape(children.join('')) })
         } else {
             scripts.push(props)
         }

html.ts

@@ -31,7 +31,7 @@ export function createHtml({
             return `<script>${v}</script>`
         } else if (util.isNEString(v.innerText)) {
             const { innerText, ...rest } = v
-            return `<script${attrString(rest)}>${innerText}</script>`
+            return `<script${attrString(rest)}>${eol}${innerText}${eol}${indent}</script>`
         } else if (util.isNEString(v.src) && !v.preload) {
             return `<script${attrString(v)}></script>`
         } else {

project.ts

@@ -1294,7 +1294,12 @@ export class Project {
                 ...pageModuleTree.map(({ id }) => this._lookupAsyncDeps(id).filter(({ url }) => reStyleModuleExt.test(url)))
             ].flat())
             ret.head = head
-            ret.scripts = await this.#renderer.renderScripts()
+            ret.scripts = await Promise.all(this.#renderer.renderScripts().map(async (script: Record<string, any>) => {
+                if (!this.isDev && script.innerText) {
+                    return { ...script, innerText: (await minify(script.innerText)).code }
+                }
+                return script
+            }))
             ret.body = `<main>${html}</main>`
             ret.data = data
             this.#rendered.get(url.pagePath)!.set(key, ret)
@@ -1320,7 +1325,12 @@ export class Project {
                 e404Module ? this._lookupAsyncDeps(e404Module.id).filter(({ url }) => reStyleModuleExt.test(url)) : []
             ].flat())
             ret.head = head
-            ret.scripts = await this.#renderer.renderScripts()
+            ret.scripts = await Promise.all(this.#renderer.renderScripts().map(async (script: Record<string, any>) => {
+                if (!this.isDev && script.innerText) {
+                    return { ...script, innerText: (await minify(script.innerText)).code }
+                }
+                return script
+            }))
             ret.body = `<main>${html}</main>`
             ret.data = data
         } catch (err) {