refactor: cleanup

Author: Je

cli/init.ts

@@ -41,7 +41,7 @@ export default async function (appDir: string, options: Record<string, string |
 
     log.info('Done')
     log.info('---')
-    log.info(colors.dim('App is ready to Go.'))
+    log.info(colors.dim('Aleph is ready to Go.'))
     log.info(`${colors.dim('$')} cd ` + path.basename(appDir))
     log.info(`start(dev) : ${colors.dim('$')} ${colors.bold('aleph')} dev`)
     log.info(`start(prod): ${colors.dim('$')} ${colors.bold('aleph')} start`)

importor.ts

@@ -39,15 +39,7 @@ export function StyleLoader({ path, rawPath, resolveDir }: LoaderProps) {
 
     useEffect(() => {
         import(util.cleanPath(`/_aleph/${resolveDir}/${path}`))
-        return () => {
-            const moduleId = util.cleanPath(`/${resolveDir}/${rawPath}`)
-            const { document } = (window as any)
-            Array.from(document.head.children).forEach((el: any) => {
-                if (el.getAttribute('data-module-id') === moduleId) {
-                    document.head.removeChild(el)
-                }
-            })
-        }
+        return () => { }
     }, [])
 
     return null

project.ts

@@ -1116,6 +1116,46 @@ export default class Project {
 
 }
 
+export function injectHmr({ id, sourceFilePath, jsContent }: Module): string {
+    let hmrImportPath = path.relative(
+        path.dirname(sourceFilePath),
+        '/-/deno.land/x/aleph/hmr.js'
+    )
+    if (!hmrImportPath.startsWith('.') && !hmrImportPath.startsWith('/')) {
+        hmrImportPath = './' + hmrImportPath
+    }
+
+    const text = [
+        `import { createHotContext, RefreshRuntime, performReactRefresh } from ${JSON.stringify(hmrImportPath)};`,
+        `import.meta.hot = createHotContext(${JSON.stringify(id)});`
+    ]
+    const reactRefresh = id.endsWith('.js')
+    if (reactRefresh) {
+        text.push('')
+        text.push(
+            `const prevRefreshReg = window.$RefreshReg$;`,
+            `const prevRefreshSig = window.$RefreshSig$;`,
+            `Object.assign(window, {`,
+            `    $RefreshReg$: (type, id) => RefreshRuntime.register(type, ${JSON.stringify(id)} + " " + id),`,
+            `    $RefreshSig$: RefreshRuntime.createSignatureFunctionForTransform`,
+            `});`,
+        )
+    }
+    text.push('')
+    text.push(jsContent)
+    text.push('')
+    if (reactRefresh) {
+        text.push(
+            'window.$RefreshReg$ = prevRefreshReg;',
+            'window.$RefreshSig$ = prevRefreshSig;',
+            'import.meta.hot.accept(performReactRefresh);'
+        )
+    } else {
+        text.push('import.meta.hot.accept();')
+    }
+    return text.join('\n')
+}
+
 function relativePath(from: string, to: string): string {
     let r = path.relative(from, to)
     if (!r.startsWith('.') && !r.startsWith('/')) {

server/server.ts

@@ -1,6 +1,6 @@
 import { createHtml } from '../html.ts'
 import log from '../log.ts'
-import Project from '../project.ts'
+import Project, { injectHmr } from '../project.ts'
 import { createRouter } from '../router.ts'
 import { path, serve, ws } from '../std.ts'
 import util, { hashShort } from '../util.ts'
@@ -134,11 +134,7 @@ export async function start(appDir: string, port: number, isDev = false) {
                                 } else {
                                     body = mod.jsContent
                                     if (project.isHMRable(mod.id)) {
-                                        body = injectHmr({
-                                            id: mod.id,
-                                            sourceFilePath: mod.sourceFilePath,
-                                            jsContent: body
-                                        })
+                                        body = injectHmr({ ...mod, jsContent: body })
                                     }
                                 }
                                 req.respond({
@@ -213,42 +209,4 @@ export async function start(appDir: string, port: number, isDev = false) {
     }
 }
 
-function injectHmr({ id, sourceFilePath, jsContent }: { id: string, sourceFilePath: string, jsContent: string }) {
-    let hmrImportPath = path.relative(
-        path.dirname(sourceFilePath),
-        '/-/deno.land/x/aleph/hmr.js'
-    )
-    if (!hmrImportPath.startsWith('.') && !hmrImportPath.startsWith('/')) {
-        hmrImportPath = './' + hmrImportPath
-    }
 
-    const text = [
-        `import { createHotContext, RefreshRuntime, performReactRefresh } from ${JSON.stringify(hmrImportPath)};`,
-        `import.meta.hot = createHotContext(${JSON.stringify(id)});`
-    ]
-    const reactRefresh = id.endsWith('.js')
-    if (reactRefresh) {
-        text.push('')
-        text.push(
-            `const prevRefreshReg = window.$RefreshReg$;`,
-            `const prevRefreshSig = window.$RefreshSig$;`,
-            `Object.assign(window, {`,
-            `    $RefreshReg$: (type, id) => RefreshRuntime.register(type, ${JSON.stringify(id)} + " " + id),`,
-            `    $RefreshSig$: RefreshRuntime.createSignatureFunctionForTransform`,
-            `});`,
-        )
-    }
-    text.push('')
-    text.push(jsContent)
-    text.push('')
-    if (reactRefresh) {
-        text.push(
-            'window.$RefreshReg$ = prevRefreshReg;',
-            'window.$RefreshSig$ = prevRefreshSig;',
-            'import.meta.hot.accept(performReactRefresh);'
-        )
-    } else {
-        text.push('import.meta.hot.accept();')
-    }
-    return text.join('\n')
-}

std.ts

@@ -4,7 +4,7 @@ export { ensureDir } from 'https://deno.land/[email protected]/fs/ensure_dir.ts'
 export { ensureFile } from 'https://deno.land/[email protected]/fs/ensure_file.ts'
 export { walk } from 'https://deno.land/[email protected]/fs/walk.ts'
 export { Sha1 } from 'https://deno.land/[email protected]/hash/sha1.ts'
-export * from 'https://deno.land/[email protected]/http/server.ts'
+export { listenAndServe, serve, ServerRequest } from 'https://deno.land/[email protected]/http/server.ts'
 export { fromStreamReader } from 'https://deno.land/[email protected]/io/mod.ts'
 export * as path from 'https://deno.land/[email protected]/path/mod.ts'
 export * as ws from 'https://deno.land/[email protected]/ws/mod.ts'