Merge pull request #176 from alephjs/rewrite-bundler

Rewrite bundler

Author: ije

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
-*.env
+.env
+.env.*
 Thumbs.db
 compiler/target/
 compiler/pkg/

.vscode/settings.json

@@ -4,7 +4,8 @@
   "typescript.format.semicolons": "remove",
   "typescript.preferences.quoteStyle": "single",
   "[javascript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
+    "editor.defaultFormatter": "vscode.typescript-language-features",
+    "editor.formatOnSave": false,
   },
   "[typescript]": {
     "editor.defaultFormatter": "vscode.typescript-language-features",
@@ -25,6 +26,6 @@
     "editor.formatOnSave": true,
   },
   "deno.enable": true,
-  "deno.unstable": false,
+  "deno.unstable": true,
   "deno.importMap": "./import_map.json"
 }

CONTRIBUTING.md

@@ -21,20 +21,17 @@ You will need [Deno](https://deno.land/) 1.7+.
 7. Marge to master branch by our maintainers.
 
 ```bash
-# set dev env
-echo 'ALEPH_DEV_PORT=2021' > .local.env
-
 # ssr/development with HMR
-deno run -A cli.ts dev ./examples/hello-world -L debug
+ALEPH_DEV_PORT=2020 deno run -A --unstable --location=http://localhost dev ./examples/hello-world -L debug
 
 # ssr/production
-deno run -A cli.ts start ./examples/hello-world -L debug
+ALEPH_DEV_PORT=2020 deno run -A --unstable --location=http://localhost start ./examples/hello-world -L debug
 
 # ssg
-deno run -A cli.ts build ./examples/hello-world -L debug
+ALEPH_DEV_PORT=2020 deno run -A --unstable --location=http://localhost build ./examples/hello-world -L debug
 
 # run all tests
-deno test -A --location=http://localhost
+deno test -A --unstable --location=https://deno.land/x/aleph
 ```
 
 ## Project Structure

cli.ts

@@ -33,17 +33,15 @@ Options:
 
 async function main() {
   const { _: args, ...options } = flags.parse(Deno.args)
-  const hasCommand = args.length > 0 && args[0] in commands
-  const command = (hasCommand ? String(args.shift()) : 'dev') as keyof typeof commands
 
   // prints aleph.js version
-  if (options.v && command != 'upgrade') {
+  if (options.v) {
     console.log(`aleph.js v${VERSION}`)
     Deno.exit(0)
   }
 
   // prints aleph.js and deno version
-  if (options.version && command != 'upgrade') {
+  if (options.version) {
     const { deno, v8, typescript } = Deno.version
     console.log([
       `aleph.js ${VERSION}`,
@@ -54,18 +52,43 @@ async function main() {
     Deno.exit(0)
   }
 
-  // prints help message
+  // prints help message when the command not found
+  if (!(args.length > 0 && args[0] in commands)) {
+    console.log(helpMessage)
+    Deno.exit(0)
+  }
+
+  const command = String(args.shift()) as keyof typeof commands
+
+  // prints command help message
   if (options.h || options.help) {
-    if (hasCommand) {
-      import(`./cli/${command}.ts`).then(({ helpMessage }) => {
-        console.log(commands[command] + '\n' + helpMessage)
-        Deno.exit(0)
-      })
-      return
-    } else {
+    import(`./cli/${command}.ts`).then(({ helpMessage }) => {
+      console.log(commands[command])
       console.log(helpMessage)
       Deno.exit(0)
-    }
+    })
+    return
+  }
+
+  // import command module
+  const { default: cmd } = await import(`./cli/${command}.ts`)
+
+  // execute `init` command
+  if (command === 'init') {
+    await cmd(args[0])
+    return
+  }
+
+  // execute `upgrade` command
+  if (command === 'upgrade') {
+    await cmd(options.v || options.version || args[0] || 'latest')
+    return
+  }
+
+  // proxy https://deno.land/x/aleph on localhost
+  const v = Deno.env.get('ALEPH_DEV_PORT')
+  if (v !== undefined && /^\d+$/.test(v)) {
+    localProxy(parseInt(v))
   }
 
   // sets log level
@@ -74,25 +97,15 @@ async function main() {
     log.setLevel(l.toLowerCase() as LevelNames)
   }
 
-  if (!hasCommand && !args[0]) {
-    const walkOptions = { includeDirs: false, exts: ['.js', '.jsx', '.mjs', '.ts', '.tsx'], skip: [/\.d\.ts$/i], dep: 1 }
-    const pagesDir = path.join(path.resolve('.'), 'pages')
-    let hasIndexPage = false
-    if (existsDirSync(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)
-    }
+  // check working Dir
+  const workingDir = path.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(Deno.cwd(), { exts: ['env'], maxDepth: 1 })) {
+  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, '=')
@@ -104,25 +117,7 @@ async function main() {
     log.info('load env from', path.basename(p))
   }
 
-  // proxy https://deno.land/x/aleph on localhost
-  localProxy()
-
-  const { default: cmd } = await import(`./cli/${command}.ts`)
-  switch (command) {
-    case 'init':
-      await cmd(args[0])
-      break
-    case 'upgrade':
-      await cmd(options.v || options.version || args[0] || 'latest')
-      break
-    default:
-      const appDir = path.resolve(String(args[0] || '.'))
-      if (!existsDirSync(appDir)) {
-        log.fatal('No such directory:', appDir)
-      }
-      await cmd(appDir, options)
-      break
-  }
+  await cmd(workingDir, options)
 }
 
 if (import.meta.main) {

cli/upgrade.ts

@@ -1,19 +1,20 @@
-import { colors } from '../deps.ts'
-import { VERSION } from '../version.ts'
+import { colors, path } from '../deps.ts'
+import { existsFileSync } from '../shared/fs.ts'
+
+const versionMetaUrl = 'https://cdn.deno.land/aleph/meta/versions.json'
 
 export const helpMessage = `
 Usage:
     aleph upgrade
 
 Options:
-    -v, --version <version>  The upgrading version
+        --version <version>  The version to upgrade to
     -h, --help               Prints help message
 `
 
-export default async function (version: string) {
+export default async function (version = 'latest') {
   console.log('Looking up latest version...')
-  const metaUrl = 'https://cdn.deno.land/aleph/meta/versions.json'
-  const { latest, versions } = await (await fetch(metaUrl)).json()
+  const { latest, versions } = await (await fetch(versionMetaUrl)).json()
   if (version === 'latest') {
     version = latest
   } else if (!versions.includes(version)) {
@@ -23,17 +24,31 @@ export default async function (version: string) {
       Deno.exit(1)
     }
   }
-  if (version === 'v' + VERSION) {
-    console.log('Already up-to-date!')
-    Deno.exit(0)
-  }
+
+  const denoExecPath = Deno.execPath()
+  const cmdExists = existsFileSync(path.join(path.dirname(denoExecPath), 'aleph'))
   const p = Deno.run({
-    cmd: [Deno.execPath(), 'install', '-A', '-f', '--location', 'http://localhost', '-n', 'aleph', `https://deno.land/x/aleph@${version}/cli.ts`],
+    cmd: [
+      denoExecPath,
+      'install',
+      '-A',
+      '-f',
+      '--unstable',
+      '-n', 'aleph',
+      '--location', 'https://deno.land/x/aleph',
+      `https://deno.land/x/aleph@${version}/cli.ts`
+    ],
     stdout: 'null',
-    stderr: 'piped'
+    stderr: 'inherit'
   })
-  Deno.stderr.write(await p.stderrOutput())
-  console.log(`Aleph.js is up to ${version}!`)
-  p.close()
-  Deno.exit(0)
+  const status = await p.status()
+  if (status.success) {
+    if (cmdExists) {
+      console.log(`Aleph.js is up to ${version}!`)
+    } else {
+      console.log('Aleph.js was installed successfully!')
+      console.log(`Run 'aleph --help' to get started`)
+    }
+  }
+  Deno.exit(status.code)
 }