chore: Merge

Author: Je

cli.ts

@@ -1,7 +1,7 @@
-import { listenAndServe, path, ServerRequest } from './deps.ts'
 import { createHtml } from './html.ts'
 import log from './log.ts'
 import { getContentType } from './server/mime.ts'
+import { listenAndServe, path, ServerRequest, walk } from './std.ts'
 import util from './util.ts'
 import { version } from './version.ts'
 
@@ -23,7 +23,7 @@ Options:
     -v, --version  Prints version number
 `
 
-function main() {
+async function main() {
     // parse deno args
     const args: Array<string> = []
     const argOptions: Record<string, string | boolean> = {}
@@ -80,8 +80,9 @@ function main() {
     }
 
     // sets log level
-    if (argOptions.l || argOptions.log) {
-        log.setLevel(String(argOptions.l || argOptions.log))
+    const l = argOptions.l || argOptions.log
+    if (util.isNEString(l)) {
+        log.setLevel(l)
     }
 
     // proxy https://deno.land/x/aleph
@@ -142,6 +143,23 @@ function main() {
         }
     }
 
+    if (!hasCommand) {
+        const walkOptions = { includeDirs: false, exts: ['.js', '.jsx', '.mjs', '.ts', '.tsx'], skip: [/\.d\.ts$/i], dep: 1 }
+        const pagesDir = path.join(path.resolve(args[0] || '.'), 'pages')
+        let hasIndexPage = false
+        if (util.existsDir(pagesDir)) {
+            for await (const { path: p } of walk(pagesDir, walkOptions)) {
+                if (path.basename(p).split('.')[0] === 'index') {
+                    hasIndexPage = true
+                }
+            }
+        }
+        if (!hasIndexPage) {
+            console.log(helpMessage)
+            Deno.exit(0)
+        }
+    }
+
     // execute command
     const command = hasCommand ? args.shift() : 'dev'
     import(`./cli/${command}.ts`).then(({ default: cmd }) => {

cli/dev.ts

@@ -14,6 +14,6 @@ Options:
     -h, --help  Prints help message
 `
 
-export default function (appDir: string, options: Record<string, string | boolean>) {
-    start(appDir, parseInt(String(options.port || options.p)) || 8080, true)
+export default function (appDir: string, options: { port?: string, p?: string }) {
+    start(appDir, parseInt(options.port || options.p || '8080') || 8080, true)
 }

cli/init.ts

@@ -1,5 +1,6 @@
-import { colors, ensureDir, ensureFile, fromStreamReader, gzipDecode, path, Untar } from '../deps.ts'
+import { gzipDecode } from 'https://deno.land/x/[email protected]/mod.ts'
 import log from '../log.ts'
+import { colors, ensureDir, ensureFile, fromStreamReader, path, Untar } from '../std.ts'
 import util from '../util.ts'
 
 export const helpMessage = `Initiate a new aleph app.
@@ -38,11 +39,11 @@ export default async function (appDir: string, options: Record<string, string |
         }
     }
 
+    log.info('Done')
     log.info('---')
     log.info(`start(dev): ` + colors.bold(`aleph`) + ' dev ' + path.basename(appDir))
     log.info(`start(prod): ` + colors.bold(`aleph`) + ' start ' + path.basename(appDir))
     log.info(`build(prod): ` + colors.bold(`aleph`) + ' build ' + path.basename(appDir))
     log.info('---')
-    log.info('Done')
     Deno.exit(0)
 }

deps.ts

@@ -68,6 +68,10 @@ socket.addEventListener('open', () => {
     messageQueue.splice(0, messageQueue.length)
 })
 
+socket.addEventListener('close', () => {
+    location.reload()
+})
+
 socket.addEventListener('message', ({ data: rawData }: { data?: string }) => {
     if (rawData) {
         try {

hmr.ts

@@ -1,4 +1,4 @@
-import { colors } from './deps.ts'
+import { colors } from './std.ts'
 
 export enum Level {
     Debug = 0,

log.ts

@@ -1,11 +1,14 @@
-import { colors, ensureDir, less, minify, path, Sha1, walk } from './deps.ts'
+import { minify } from 'https://esm.sh/terser'
 import { EventEmitter } from './events.ts'
 import { createHtml } from './html.ts'
 import log from './log.ts'
 import route from './route.ts'
+import { colors, ensureDir, path, Sha1, walk } from './std.ts'
 import { compile } from './tsc/compile.ts'
 import type { APIHandle, Config, Location, RouterURL } from './types.ts'
 import util, { hashShort } from './util.ts'
+import './vendor/clean-css-builds/v4.2.2.js'
+import less from './vendor/less/less.js'
 
 const reHttp = /^https?:\/\//i
 const reModuleExt = /\.(js|jsx|mjs|ts|tsx)$/i
@@ -378,7 +381,7 @@ export default class Project {
         const pagesDir = path.join(this.srcDir, 'pages')
 
         if (!(util.existsDir(pagesDir))) {
-            log.fatal('please create some pages.')
+            log.fatal(`'pages' directory not found.`)
         }
 
         Object.assign(globalThis, {

project.ts

@@ -1,4 +1,4 @@
-import type { ServerRequest } from '../deps.ts'
+import type { ServerRequest } from '../std.ts'
 import type { APIRequest, APIResponse } from '../types.ts'
 
 export class PostAPIRequest implements APIRequest {

server/api.ts

@@ -1,8 +1,8 @@
-import { path, serve, ws } from '../deps.ts'
 import { createHtml } from '../html.ts'
 import log from '../log.ts'
 import Project from '../project.ts'
 import route from '../route.ts'
+import { path, serve, ws } from '../std.ts'
 import util, { hashShort } from '../util.ts'
 import { PostAPIRequest, PostAPIResponse } from './api.ts'
 import { getContentType } from './mime.ts'

server/server.ts

@@ -0,0 +1,11 @@
+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 { 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 { 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'
+