Simplify cli deps

Author: ije

cli.ts

@@ -1,9 +1,7 @@
-import { resolve, basename } from 'https://deno.land/[email protected]/path/mod.ts'
-import { walk } from 'https://deno.land/[email protected]/fs/walk.ts'
+import { resolve } from 'https://deno.land/[email protected]/path/mod.ts'
 import { parse } from 'https://deno.land/[email protected]/flags/mod.ts'
 import { existsDirSync } from './shared/fs.ts'
-import type { LevelNames } from './shared/log.ts'
-import log from './shared/log.ts'
+import log, { LevelNames } from './shared/log.ts'
 import util from './shared/util.ts'
 import { VERSION } from './version.ts'
 
@@ -92,32 +90,11 @@ async function main() {
     log.setLevel(l.toLowerCase() as LevelNames)
   }
 
-  // proxy https://deno.land/x/aleph on localhost
-  const v = Deno.env.get('ALEPH_DEV')
-  if (v !== undefined) {
-    const { localProxy } = await import('./server/localproxy.ts')
-    localProxy(Deno.cwd(), 2020)
-  }
-
   // check working dir
   const workingDir = resolve(String(args[0] || '.'))
   if (!existsDirSync(workingDir)) {
     log.fatal('No such directory:', workingDir)
   }
-  Deno.chdir(workingDir)
-
-  // load .env
-  for await (const { path: p, } of walk(workingDir, { match: [/(^|\/|\\)\.env(\.|$)/i], maxDepth: 1 })) {
-    const text = await Deno.readTextFile(p)
-    text.split('\n').forEach(line => {
-      let [key, value] = util.splitBy(line, '=')
-      key = key.trim()
-      if (key) {
-        Deno.env.set(key, value.trim())
-      }
-    })
-    log.info('load env from', basename(p))
-  }
 
   await cmd(workingDir, options)
 }

framework/react/hooks.ts

@@ -38,7 +38,7 @@ export function useDeno<T = any>(callback: () => (T | Promise<T>), revalidate?:
   return useMemo(() => {
     const global = globalThis as any
     const qs = query.toString()
-    const dataUrl = 'pagedata://' + pathname + (qs ? '?' + qs : '')
+    const dataUrl = 'pagedata://' + [pathname, qs].filter(Boolean).join('?')
     const eventName = 'useDeno-' + dataUrl
     const key = dataUrl + '#' + id
     const expires = typeof revalidate === 'number' && !isNaN(revalidate) ? Date.now() + revalidate * 1000 : 0

framework/react/renderer.ts

@@ -34,7 +34,7 @@ export async function render(
     inlineStyles: new Map(),
   }
   const qs = url.query.toString()
-  const dataUrl = 'pagedata://' + url.pathname + (qs ? '?' + qs : '')
+  const dataUrl = 'pagedata://' + [url.pathname, qs].filter(Boolean).join('?')
   const asyncCalls: Array<Promise<any>> = []
   const data: Record<string, any> = {}
   const pageProps = createPageProps(nestedPageComponents)

server/app.ts

@@ -43,6 +43,7 @@ import {
 } from './config.ts'
 import { CSSProcessor } from './css.ts'
 import {
+  checkAlephDev,
   computeHash,
   formatBytesWithColor,
   getAlephPkgUri,
@@ -100,6 +101,7 @@ export class Application implements ServerApplication {
       log.error(`Aleph.js needs Deno ${minDenoVersion}+, please upgrade Deno.`)
       Deno.exit(1)
     }
+    checkAlephDev()
     this.workingDir = resolve(workingDir)
     this.mode = mode
     this.config = { ...defaultConfig }
@@ -127,6 +129,19 @@ export class Application implements ServerApplication {
     this.#cssProcesser.config(!this.isDev, this.config.css)
 
     // inject env variables
+    // load .env
+    for await (const { path: p, } of walk(this.workingDir, { match: [/(^|\/|\\)\.env(\.|$)/i], maxDepth: 1 })) {
+      const text = await Deno.readTextFile(p)
+      text.split('\n').forEach(line => {
+        let [key, value] = util.splitBy(line, '=')
+        key = key.trim()
+        if (key) {
+          Deno.env.set(key, value.trim())
+        }
+      })
+      log.info('load env from', basename(p))
+    }
+
     Deno.env.set('ALEPH_VERSION', VERSION)
     Deno.env.set('ALEPH_BUILD_MODE', this.mode)
     Deno.env.set('ALEPH_FRAMEWORK', this.framework)

server/helper.ts

@@ -5,17 +5,29 @@ import { existsDirSync } from '../shared/fs.ts'
 import util from '../shared/util.ts'
 import type { ServerPlugin, LoaderPlugin } from '../types.ts'
 import { VERSION } from '../version.ts'
+import { localProxy } from './localproxy.ts'
 
 export const reLocaleID = /^[a-z]{2}(-[a-zA-Z0-9]+)?$/
 export const reFullVersion = /@v?\d+\.\d+\.\d+/i
 
+let __denoDir: string | null = null
+let __localProxy = false
+
+/** check whether should proxy https://deno.land/x/aleph on local. */
+export function checkAlephDev() {
+  const v = Deno.env.get('ALEPH_DEV')
+  if (v !== undefined && !__localProxy) {
+    localProxy(Deno.cwd(), 2020)
+    __localProxy = true
+  }
+}
+
 /** check the plugin whether is a loader plugin. */
 export function isLoaderPlugin(plugin: LoaderPlugin | ServerPlugin): plugin is LoaderPlugin {
   return plugin.type === 'loader'
 }
 
 /** get deno dir. */
-let __denoDir: string | null = null
 export async function getDenoDir() {
   if (__denoDir !== null) {
     return __denoDir

server/ssr.ts

@@ -116,6 +116,8 @@ export class Renderer {
       nestedModules.map(({ url }) => url)
     ].flat())
 
+
+    Deno.chdir(this.#app.workingDir)
     const { head, body, data, scripts } = await this.#renderer.render(
       url,
       App,