merged from master

Author: shinspiegel

.github/workflows/aleph_in_deno.yml

@@ -3,9 +3,6 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-# This workflow will install Deno and run tests across stable and nightly builds on Windows, Ubuntu and macOS.
-# For more information see: https://github.com/denolib/setup-deno
-
 name: Aleph.js in Deno
 
 on:
@@ -16,24 +13,23 @@ on:
 
 jobs:
   test:
-    runs-on: ${{ matrix.os }} # runs a test on Ubuntu, Windows and macOS
+    runs-on: ${{ matrix.os }} # runs a test on macOS, Windows and Ubuntu
 
     strategy:
       matrix:
-        deno: ["v1.x", "nightly"]
         os: [macOS-latest, windows-latest, ubuntu-latest]
 
     steps:
       - name: Setup repo
         uses: actions/checkout@v2
 
       - name: Setup Deno
-        uses: denolib/setup-deno@c7d7968ad4a59c159a777f79adddad6872ee8d96
+        uses: denolib/setup-deno@v2
         with:
-          deno-version: ${{ matrix.deno }} # tests across multiple Deno versions
+          deno-version: v1.x
 
-      - name: Cache Dependencies
+      - name: Cache std modules
         run: deno cache std.ts
 
-      - name: Run Tests
+      - name: Run tests
         run: deno test -A --unstable

.gitignore

@@ -2,3 +2,5 @@
 Thumbs.db
 .aleph/
 dist/
+
+.vscode/launch.json

README.md

@@ -43,7 +43,7 @@ export default function Home() {
 
 ### Installation
 ```bash
-deno install -A -f -n aleph https://deno.land/x/[email protected].24/cli.ts
+deno install -A -f -n aleph https://deno.land/x/[email protected].26/cli.ts
 ```
 
 ### Usage

aleph.ts

@@ -4,7 +4,7 @@ import { E400MissingDefaultExportAsComponent, E404Page, ErrorBoundary } from './
 import events from './events.ts'
 import { createPageProps, RouteModule, Routing } from './routing.ts'
 import type { RouterURL } from './types.ts'
-import util, { hashShort, reModuleExt } from './util.ts'
+import util, { hashShort, reHttp } from './util.ts'
 
 export function ALEPH({ initial }: {
     initial: {
@@ -50,7 +50,7 @@ export function ALEPH({ initial }: {
                 if (mod.deps) {
                     // import async dependencies
                     for (const dep of mod.deps.filter(({ isStyle }) => !!isStyle)) {
-                        await import(getModuleImportUrl(baseUrl, { id: dep.url.replace(reModuleExt, '.js'), hash: dep.hash }, e.forceRefetch))
+                        await import(getModuleImportUrl(baseUrl, { id: util.ensureExt(dep.url.replace(reHttp, '/-/'), '.js'), hash: dep.hash }, e.forceRefetch))
                     }
                     if (mod.deps.filter(({ isData, url }) => !!isData && url.startsWith('#useDeno.')).length > 0) {
                         const { default: data } = await import(`/_aleph/data${[url.pathname, url.query.toString()].filter(Boolean).join('@')}/data.js` + (e.forceRefetch ? `?t=${Date.now()}` : ''))
@@ -146,7 +146,7 @@ export function ALEPH({ initial }: {
                     if (mod.deps) {
                         // import async dependencies
                         for (const dep of mod.deps.filter(({ isStyle }) => !!isStyle)) {
-                            await import(getModuleImportUrl(baseUrl, { id: dep.url.replace(reModuleExt, '.js'), hash: dep.hash }))
+                            await import(getModuleImportUrl(baseUrl, { id: util.ensureExt(dep.url.replace(reHttp, '/-/'), '.js'), hash: dep.hash }))
                         }
                         if (mod.deps.filter(({ isData, url }) => !!isData && url.startsWith('#useDeno.')).length > 0) {
                             const { default: data } = await import(`/_aleph/data${[url.pathname, url.query.toString()].filter(Boolean).join('@')}/data.js`)
@@ -208,7 +208,7 @@ export function ALEPH({ initial }: {
 }
 
 export function getModuleImportUrl(baseUrl: string, mod: RouteModule, forceRefetch = false) {
-    return util.cleanPath(baseUrl + '/_aleph/' + util.trimSuffix(mod.id, '.js') + `.${mod.hash.slice(0, hashShort)}.js` + (forceRefetch ? `?t=${Date.now()}` : ''))
+    return util.cleanPath(baseUrl + '/_aleph/' + (mod.id.startsWith('/-/') ? mod.id : util.trimSuffix(mod.id, '.js') + `.${mod.hash.slice(0, hashShort)}.js`) + (forceRefetch ? `?t=${Date.now()}` : ''))
 }
 
 export async function redirect(url: string, replace?: boolean) {

bootstrap.ts

@@ -2,20 +2,22 @@ import React, { ComponentType } from 'https://esm.sh/react'
 import { hydrate, render } from 'https://esm.sh/react-dom'
 import { ALEPH, getModuleImportUrl } from './aleph.ts'
 import { Route, RouteModule, Routing } from './routing.ts'
-import { reModuleExt } from './util.ts'
+import util, { reHttp } from './util.ts'
 
 export default async function bootstrap({
     routes,
     baseUrl,
     defaultLocale,
     locales,
-    preloadModules
+    preloadModules,
+    renderMode
 }: {
     routes: Route[]
     baseUrl: string
     defaultLocale: string
     locales: string[]
-    preloadModules: RouteModule[]
+    preloadModules: RouteModule[],
+    renderMode: 'ssr' | 'spa'
 }) {
     const { document } = window as any
     const mainEl = document.querySelector('main')
@@ -29,7 +31,7 @@ export default async function bootstrap({
         if (mod.deps) {
             // import async dependencies
             for (const dep of mod.deps.filter(({ isStyle }) => !!isStyle)) {
-                await import(getModuleImportUrl(baseUrl, { id: dep.url.replace(reModuleExt, '.js'), hash: dep.hash }))
+                await import(getModuleImportUrl(baseUrl, { id: util.ensureExt(dep.url.replace(reHttp, '/-/'), '.js'), hash: dep.hash }))
             }
         }
         switch (mod.id) {
@@ -67,7 +69,7 @@ export default async function bootstrap({
             }
         }
     )
-    if (mainEl.childElementCount > 0) {
+    if (renderMode === 'ssr') {
         hydrate(el, mainEl)
     } else {
         render(el, mainEl)