Clean up

Author: ije

framework/react/renderer.ts

@@ -12,7 +12,7 @@ import { createPageProps } from './pageprops.ts'
 
 export type RendererStorage = {
   headElements: Map<string, { type: string, props: Record<string, any> }>
-  scriptElements: Map<string, { props: Record<string, any> }>
+  scripts: Map<string, { props: Record<string, any> }>
 }
 
 export async function render(
@@ -29,7 +29,7 @@ export async function render(
   }
   const rendererStorage: RendererStorage = {
     headElements: new Map(),
-    scriptElements: new Map(),
+    scripts: new Map(),
   }
   const pagedataUrl = 'pagedata://' + url.pathname
   const asyncCalls: Array<Promise<any>> = []
@@ -124,7 +124,7 @@ export async function render(
   })
 
   // get script tags
-  rendererStorage.scriptElements.forEach(({ props }) => {
+  rendererStorage.scripts.forEach(({ props }) => {
     const { children, dangerouslySetInnerHTML, ...attrs } = props
     if (dangerouslySetInnerHTML && util.isNEString(dangerouslySetInnerHTML.__html)) {
       ret.scripts.push({ ...attrs, innerText: dangerouslySetInnerHTML.__html })

framework/react/script.ts

@@ -7,11 +7,11 @@ import util from '../../shared/util.ts'
 import { SSRContext } from './context.ts'
 
 export default function Script(props: PropsWithChildren<ScriptHTMLAttributes<{}>>) {
-  const { scriptElements } = useContext(SSRContext)
+  const { scripts } = useContext(SSRContext)
 
   if (util.inDeno) {
-    const key = 'script-' + (scriptElements.size + 1)
-    scriptElements.set(key, { props })
+    const key = 'script-' + (scripts.size + 1)
+    scripts.set(key, { props })
   }
 
   // todo: insert page scripts in browser

import_map.json

@@ -1,8 +1,6 @@
 {
   "imports": {
     "std/": "https://deno.land/[email protected]/",
-    "brotli": "https://deno.land/x/[email protected]/mod.ts",
-    "gzip": "https://deno.land/x/[email protected]/mod.ts",
     "aleph/": "https://deno.land/x/[email protected]/",
     "framework": "https://deno.land/x/[email protected]/framework/core/mod.ts",
     "framework/react": "https://deno.land/x/[email protected]/framework/react/mod.ts",

server/api.ts

@@ -140,35 +140,38 @@ export class Request implements APIRequest {
       contentType = this.#resp.headers.get('Content-Type')!
     } else if (typeof data === 'string' && data.length > 0) {
       contentType = 'text/plain; charset=utf-8'
+      this.#resp.headers.set('Content-Type', contentType)
     }
-    let shouldCompress = false
-    if (contentType) {
-      if (contentType.startsWith('text/')) {
-        shouldCompress = true
-      } else if (/^application\/(javascript|typecript|wasm|json|xml)/i.test(contentType)) {
-        shouldCompress = true
-      } else if (/^image\/svg\+xml/i.test(contentType)) {
-        shouldCompress = true
-      }
-    }
-    if (shouldCompress && Deno.env.get('ALEPH_BUILD_MODE') !== 'development' && body.length > 1024) {
-      const ae = this.headers.get('accept-encoding') || ''
-      if (ae.includes('br')) {
-        this.#resp.headers.set('Vary', 'Origin')
-        this.#resp.headers.set('Content-Encoding', 'br')
-        if (brotli === null) {
-          const { compress } = await import('https://deno.land/x/[email protected]/mod.ts')
-          brotli = compress
+    if (Deno.env.get('ALEPH_BUILD_MODE') !== 'development') {
+      let shouldCompress = false
+      if (contentType) {
+        if (contentType.startsWith('text/')) {
+          shouldCompress = true
+        } else if (/^application\/(javascript|typecript|wasm|json|xml)/i.test(contentType)) {
+          shouldCompress = true
+        } else if (/^image\/svg\+xml/i.test(contentType)) {
+          shouldCompress = true
         }
-        body = brotli(body)
-      } else if (ae.includes('gzip')) {
-        this.#resp.headers.set('Vary', 'Origin')
-        this.#resp.headers.set('Content-Encoding', 'gzip')
-        if (gzip === null) {
-          const { gzipEncode } = await import('https://deno.land/x/[email protected]/mod.ts')
-          gzip = gzipEncode
+      }
+      if (shouldCompress && body.length > 1024) {
+        const ae = this.headers.get('accept-encoding') || ''
+        if (ae.includes('br')) {
+          this.#resp.headers.set('Vary', 'Origin')
+          this.#resp.headers.set('Content-Encoding', 'br')
+          if (brotli === null) {
+            const { compress } = await import('https://deno.land/x/[email protected]/mod.ts')
+            brotli = compress
+          }
+          body = brotli(body)
+        } else if (ae.includes('gzip')) {
+          this.#resp.headers.set('Vary', 'Origin')
+          this.#resp.headers.set('Content-Encoding', 'gzip')
+          if (gzip === null) {
+            const denoflate = await import('https://deno.land/x/[email protected]/mod.ts')
+            gzip = (data: Uint8Array) => denoflate.gzip(data, undefined)
+          }
+          body = gzip(body)
         }
-        body = gzip(body)
       }
     }
     this.#resp.headers.set('Date', (new Date).toUTCString())

server/config.ts

@@ -124,8 +124,6 @@ export async function loadConfig(workingDir: string): Promise<Config> {
   return config
 }
 
-
-
 /** load import maps from `import_map.json` */
 export async function loadImportMap(workingDir: string): Promise<ImportMap> {
   const importMap: ImportMap = { imports: {}, scopes: {} }