chore: resolve conflicts

Author: shadowtime2000

README.md

@@ -30,6 +30,7 @@ export default function App() {
 ```
 
 ### Features
+
 - Zero Config
 - Typescript in Deno
 - High Performance Comilper
@@ -43,11 +44,13 @@ export default function App() {
 - SSR/SSG
 
 ### Installation
+
 ```bash
-deno install -A -f -n aleph https://deno.land/x/[email protected].26/cli.ts
+deno install -A -f -n aleph https://deno.land/x/[email protected].28/cli.ts
 ```
 
 ### Usage
+
 ```bash
 # create a new app
 aleph init hello
@@ -67,7 +70,9 @@ aleph -h
 ```
 
 ### Documentation
+
 Please visit https://alephjs.org/docs to view the documentation.
 
 ### Contributing
+
 Please read the [contributing.md](CONTRIBUTING.md).

cli/dev.ts

@@ -21,5 +21,5 @@ export default async function (appDir: string, options: Record<string, string |
         log.error(`invalid port '${options.port || options.p}'`)
         Deno.exit(1)
     }
-    start(appDir, port, true, Boolean(options.r || options.reload))
+    start(appDir, 'localhost', port, true, Boolean(options.r || options.reload))
 }

cli/start.ts

@@ -1,5 +1,4 @@
 import log from '../server/log.ts'
-import { start } from '../server/server.ts'
 
 export const helpMessage = `
 Usage:
@@ -9,17 +8,20 @@ Usage:
 if the <dir> is empty, the current directory will be used.
 
 Options:
+    -hn, --hostname  The address at which the server is to be started.
     -p, --port       A port number to start the aleph.js app, default is 8080
     -L, --log-level  Set log level [possible values: debug, info]
     -r, --reload     Reload source code cache
     -h, --help       Prints help message
 `
 
 export default async function (appDir: string, options: Record<string, string | boolean>) {
+    const { start } = await import('../server/server.ts')
+    const host = String(options.hn || options.hostname || 'localhost')
     const port = parseInt(String(options.p || options.port || '8080'))
     if (isNaN(port) || port <= 0 || !Number.isInteger(port)) {
         log.error(`invalid port '${options.port || options.p}'`)
         Deno.exit(1)
     }
-    start(appDir, port, false, Boolean(options.r || options.reload))
+    start(appDir, host, port, false, Boolean(options.r || options.reload))
 }

egg.json

@@ -1,6 +1,6 @@
 {
   "name": "aleph",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "The React Framework in Deno.",
   "homepage": "https://alephjs.org",
   "repository": "https://github.com/alephjs/aleph.js",

plugins/sass.ts

@@ -1,26 +1,9 @@
 import { Options, renderSync } from 'https://esm.sh/[email protected]'
 
-const defaultPlugin = {
+const pluginFactory = (opts: Options = {}) => ({
     name: 'sass-loader',
     test: /.(sass|scss)$/,
     acceptHMR: true,
-    transform(content: Uint8Array, path: string) {
-        const ret = renderSync({
-            file: path,
-            data: (new TextDecoder).decode(content),
-            sourceMap: true,
-            indentedSyntax: path.endsWith('.sass')
-        })
-        return {
-            code: (new TextDecoder).decode(ret.css),
-            map: ret.map ? (new TextDecoder).decode(ret.map) : undefined,
-            loader: 'css'
-        }
-    }
-}
-
-const pluginFactory = (opts: Options) => ({
-    ...defaultPlugin,
     transform(content: Uint8Array, path: string) {
         const ret = renderSync({
             indentedSyntax: path.endsWith('.sass'),
@@ -37,6 +20,8 @@ const pluginFactory = (opts: Options) => ({
     }
 })
 
+const defaultPlugin = pluginFactory()
+
 pluginFactory.displayName = defaultPlugin.name
 pluginFactory.test = defaultPlugin.test
 pluginFactory.acceptHMR = defaultPlugin.acceptHMR

server/server.ts

@@ -7,14 +7,14 @@ import { getContentType } from './mime.ts'
 import { Project } from './project.ts'
 import { createHtml, existsFileSync } from './util.ts'
 
-export async function start(appDir: string, port: number, isDev = false, reload = false) {
+export async function start(appDir: string, hostname: string, port: number, isDev = false, reload = false) {
     const project = new Project(appDir, isDev ? 'development' : 'production', reload)
     await project.ready
 
     while (true) {
         try {
-            const s = serve({ port })
-            log.info(`Server ready on http://localhost:${port}`)
+            const s = serve({ hostname, port })
+            log.info(`Server ready on http://${hostname}:${port}`)
             for await (const req of s) {
                 const url = new URL('http://localhost/' + req.url)
                 const pathname = util.cleanPath(url.pathname)

std.ts

@@ -0,0 +1,12 @@
+export * as bytes from 'https://deno.land/[email protected]/bytes/mod.ts'
+export { Untar } from 'https://deno.land/[email protected]/archive/tar.ts'
+export * as colors from 'https://deno.land/[email protected]/fmt/colors.ts'
+export { ensureDir } from 'https://deno.land/[email protected]/fs/ensure_dir.ts'
+export { walk } from 'https://deno.land/[email protected]/fs/walk.ts'
+export { Sha1 } from 'https://deno.land/[email protected]/hash/sha1.ts'
+export { listenAndServe, serve, ServerRequest } from 'https://deno.land/[email protected]/http/server.ts'
+export type { Response } 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'
+