Merge pull request #321 from alephjs/feat-0.3-beta

Land 0.3 beta

Author: ije

CONTRIBUTING.md

@@ -22,16 +22,16 @@ You will need [Deno](https://deno.land/) 1.8+.
 
 ```bash
 # ssr/development with HMR
-ALEPH_DEV=true deno run -A --unstable --location=http://0.0.0.0 cli.ts dev ./examples/hello-world -L debug
+ALEPH_DEV=true deno run -A --unstable --location=http://localhost cli.ts dev ./examples/hello-world -L debug
 
 # ssr/production
-ALEPH_DEV=true deno run -A --unstable --location=http://0.0.0.0 cli.ts start ./examples/hello-world -L debug
+ALEPH_DEV=true deno run -A --unstable --location=http://localhost cli.ts start ./examples/hello-world -L debug
 
 # ssg
-ALEPH_DEV=true deno run -A --unstable --location=http://0.0.0.0 cli.ts build ./examples/hello-world -L debug
+ALEPH_DEV=true deno run -A --unstable --location=http://localhost cli.ts build ./examples/hello-world -L debug
 
 # run all tests
-deno test -A --unstable --location=http://0.0.0.0 --import-map=./import_map.json
+deno test -A --unstable --location=http://localhost --import-map=./import_map.json
 ```
 
 ## Project Structure

bundler/esbuild.ts

@@ -1,31 +1,39 @@
-import { join } from 'https://deno.land/std@0.96.0/path/mod.ts'
+import { join } from 'https://deno.land/std@0.100.0/path/mod.ts'
 import { cache } from '../server/cache.ts'
 import util from '../shared/util.ts'
-// @deno-types="https://deno.land/x/esbuild@v0.11.22/mod.d.ts"
-import { build, stop, Plugin } from 'https://deno.land/x/esbuild@v0.11.22/mod.js'
+// @deno-types="https://deno.land/x/esbuild@v0.12.22/mod.d.ts"
+import { build, stop, Plugin } from 'https://deno.land/x/esbuild@v0.12.22/mod.js'
 
 export {
   build as esbuild,
   stop as stopEsbuild
 }
 
-export const esbuildUrlLoader: Plugin = {
-  name: 'http-loader',
+export const esmLoader: Plugin = {
+  name: 'esm-loader',
   setup(build) {
     build.onResolve({ filter: /.*/ }, args => {
-      if (util.isLikelyHttpURL(args.path)) {
+      const isRemote = util.isLikelyHttpURL(args.path)
+      const path = isRemote ? args.path : util.trimPrefix(args.path, 'file://')
+
+      if (
+        args.kind === 'url-token' ||
+        (args.kind === 'import-rule' && (isRemote || path.startsWith('/')))
+      ) {
+        return { path: path, external: true }
+      }
+      if (isRemote) {
         return {
-          path: args.path,
+          path,
           namespace: 'http-module',
         }
       }
       if (args.namespace === 'http-module') {
         return {
-          path: (new URL(args.path, args.importer)).toString(),
+          path: (new URL(path, args.importer)).toString(),
           namespace: 'http-module',
         }
       }
-      const [path] = util.splitBy(util.trimPrefix(args.path, 'file://'), '#')
       if (path.startsWith('.')) {
         return { path: join(args.resolveDir, path) }
       }