Clean up

Author: ije

bundler/esbuild.ts

@@ -40,8 +40,6 @@ export const denoPlugin: Plugin = {
       const isRemote = util.isLikelyHttpURL(args.path)
       const path = isRemote ? args.path : util.trimPrefix(args.path, 'file://')
 
-
-      console.log(args)
       if (
         args.kind === 'url-token' ||
         (args.kind === 'import-rule' && (isRemote || path.startsWith('/')))

bundler/mod.ts

@@ -167,6 +167,7 @@ export class Bundler {
         }
       )
 
+      // in production(bundle) mode we need to replace the star export with names
       if (starExports && starExports.length > 0) {
         for (let index = 0; index < starExports.length; index++) {
           const specifier = starExports[index]

compiler/build.ts

@@ -4,7 +4,6 @@ import { exists } from 'https://deno.land/[email protected]/fs/exists.ts'
 import { ensureDir } from 'https://deno.land/[email protected]/fs/ensure_dir.ts'
 import { createHash } from 'https://deno.land/[email protected]/hash/mod.ts'
 import { compress } from 'https://deno.land/x/[email protected]/mod.ts'
-import util from '../shared/util.ts'
 
 async function run(cmd: string[]) {
   const p = Deno.run({

plugins/css.ts

@@ -108,14 +108,15 @@ export const cssLoader = async ({ specifier, data }: LoadInput, aleph: Aleph): P
     css = sourceCode
   }
 
+  // in testing env, we don't bundle the css
   if (!Deno.env.get('DENO_TESTING')) {
     try {
       const ret = await esbuild({
         stdin: {
           loader: 'css',
+          contents: css,
+          sourcefile: join(aleph.workingDir, specifier),
           resolveDir: join(aleph.workingDir, dirname(specifier)),
-          sourcefile: specifier,
-          contents: css
         },
         write: false,
         bundle: true,

server/aleph.ts

@@ -21,8 +21,8 @@ import { cache } from './cache.ts'
 import type { RequiredConfig } from './config.ts'
 import { defaultConfig, fixConfigAndImportMap, getDefaultImportMap, loadConfig, loadImportMap } from './config.ts'
 import {
-  checkAlephDev, checkDenoVersion, clearBuildCache, computeHash, findFile,
-  getAlephPkgUri, getSourceType, isLocalUrl, moduleExclude, toLocalPath, toRelativePath
+  checkAlephDev, checkDenoVersion, clearBuildCache, computeHash, decoder, encoder, findFile,
+  getAlephPkgUri, getSourceType, isLocalUrl, moduleExclude, toLocalPath, toRelativePath,
 } from './helper.ts'
 import { getContentType } from './mime.ts'
 import { buildHtml, Renderer } from './renderer.ts'
@@ -798,7 +798,7 @@ export class Aleph implements IAleph {
     if (sourceType === SourceType.Unknown || sourceType === SourceType.CSS) {
       return []
     }
-    const code = (new TextDecoder).decode(content)
+    const code = decoder.decode(content)
     const names = await parseExportNames(specifier, code, { sourceType })
     return (await Promise.all(names.map(async name => {
       if (name.startsWith('{') && name.endsWith('}')) {
@@ -827,7 +827,7 @@ export class Aleph implements IAleph {
         if (type !== 'css') {
           for (const { test, load } of this.#loadListeners) {
             if (test.test(`.${type}`)) {
-              const { code, type: codeType } = await load({ specifier: key, data: (new TextEncoder).encode(tpl) })
+              const { code, type: codeType } = await load({ specifier: key, data: encoder.encode(tpl) })
               if (codeType === 'css') {
                 type = 'css'
                 tpl = code
@@ -836,7 +836,7 @@ export class Aleph implements IAleph {
             }
           }
         }
-        const { code } = await cssLoader({ specifier: key, data: (new TextEncoder).encode(tpl) }, this)
+        const { code } = await cssLoader({ specifier: key, data: encoder.encode(tpl) }, this)
         return code
       },
       isDev: this.isDev,
@@ -969,7 +969,7 @@ export class Aleph implements IAleph {
       return module.jsBuffer
     }
 
-    let code = new TextDecoder().decode(module.jsBuffer)
+    let code = decoder.decode(module.jsBuffer)
     if (module.denoHooks?.length || module.ssrPropsFn || module.ssgPathsFn) {
       if ('csrCode' in module) {
         code = (module as any).csrCode
@@ -992,7 +992,7 @@ export class Aleph implements IAleph {
         // todo: merge source map
       }
     }
-    return new TextEncoder().encode([
+    return encoder.encode([
       `import.meta.hot = $createHotContext(${JSON.stringify(specifier)});`,
       '',
       code,
@@ -1075,7 +1075,7 @@ export class Aleph implements IAleph {
       const source = await this.fetchModule(specifier)
       sourceType = getSourceType(specifier, source.contentType || undefined)
       if (sourceType !== SourceType.Unknown) {
-        sourceCode = (new TextDecoder).decode(source.content)
+        sourceCode = decoder.decode(source.content)
       }
     }
 
@@ -1234,7 +1234,6 @@ export class Aleph implements IAleph {
       }
 
       const ms = new Measure()
-      const encoder = new TextEncoder()
       const { code, deps = [], denoHooks, ssrPropsFn, ssgPathsFn, starExports, jsxStaticClassNames, map } = await transform(specifier, source.code, {
         ...this.commonCompilerOptions,
         sourceMap: this.isDev,
@@ -1405,7 +1404,7 @@ export class Aleph implements IAleph {
 
   /** replace dep hash in the `jsBuffer` and remove `csrCode` cache if it exits */
   private async replaceDepHash(module: Module, hashLoc: number, hash: string) {
-    const hashData = (new TextEncoder()).encode(hash.substr(0, 6))
+    const hashData = encoder.encode(hash.substr(0, 6))
     const jsBuffer = await this.getModuleJS(module)
     if (jsBuffer && !equals(hashData, jsBuffer.slice(hashLoc, hashLoc + 6))) {
       copy(hashData, jsBuffer, hashLoc)

server/helper.ts

@@ -50,6 +50,9 @@ export function checkAlephDev() {
   }
 }
 
+export const encoder = new TextEncoder()
+export const decoder = new TextDecoder()
+
 export const moduleExclude = [
   /(^|\/|\\)\./,
   /\.d\.ts$/i,
@@ -84,7 +87,7 @@ export async function getDenoDir() {
     stdout: 'piped',
     stderr: 'null'
   })
-  const output = (new TextDecoder).decode(await p.output())
+  const output = decoder.decode(await p.output())
   const { denoDir } = JSON.parse(output)
   p.close()
   if (denoDir === undefined || !await existsDir(denoDir)) {

server/server.ts

@@ -9,6 +9,7 @@ import util from '../shared/util.ts'
 import { APIContext } from '../types.d.ts'
 import { Aleph } from './aleph.ts'
 import compress from './compress.ts'
+import { encoder } from './helper.ts'
 import { getContentType } from './mime.ts'
 import { APIResponse } from './response.ts'
 
@@ -102,7 +103,7 @@ export class Server {
         if (compress.enable && acceptEncoding && body && contentType) {
           let data = new Uint8Array()
           if (typeof body === 'string') {
-            data = new TextEncoder().encode(body)
+            data = encoder.encode(body)
           } else if (body instanceof Uint8Array) {
             data = body
           } else if (body instanceof ArrayBuffer) {