breaking: remove mod.ts and react.ts in project root

Author: ije

cli/init.ts

@@ -60,8 +60,8 @@ export default async function (nameArg?: string) {
   const importMap = {
     imports: {
       '~/': './',
-      'aleph': `https://deno.land/x/aleph@v${VERSION}/mod.ts`,
-      'aleph/': `https://deno.land/x/aleph@v${VERSION}/`,
+      'framework': `https://deno.land/x/aleph@v${VERSION}/framework/core/mod.ts`,
+      'framework:react': `https://deno.land/x/aleph@v${VERSION}/framework/react/mod.ts`,
       'react': `https://esm.sh/react@${defaultReactVersion}`,
       'react-dom': `https://esm.sh/react-dom@${defaultReactVersion}`,
     },

framework/core/mod.ts

@@ -0,0 +1 @@
+export * from './redirect.ts'

framework/core/redirect.ts

@@ -0,0 +1,23 @@
+import util from '../../shared/util.ts'
+import events from './events.ts'
+
+export async function redirect(url: string, replace?: boolean) {
+  const { location, history } = window as any
+
+  if (!util.isNEString(url)) {
+    return
+  }
+
+  if (util.isLikelyHttpURL(url) || url.startsWith('file://') || url.startsWith('mailto:')) {
+    location.href = url
+    return
+  }
+
+  url = util.cleanPath(url)
+  if (replace) {
+    history.replaceState(null, '', url)
+  } else {
+    history.pushState(null, '', url)
+  }
+  events.emit('popstate', { type: 'popstate', resetScroll: true })
+}

framework/core/routing.ts

@@ -1,6 +1,6 @@
 import util from '../../shared/util.ts'
 import type { RouterURL } from '../../types.ts'
-import events from './events.ts'
+import { redirect } from './redirect.ts'
 
 const ghostRoute: Route = { path: '', module: { url: '' } }
 
@@ -271,24 +271,3 @@ export function rewriteURL(reqUrl: string, baseURL: string, rewrites: Record<str
   }
   return url
 }
-
-export async function redirect(url: string, replace?: boolean) {
-  const { location, history } = window as any
-
-  if (!util.isNEString(url)) {
-    return
-  }
-
-  if (util.isLikelyHttpURL(url) || url.startsWith('file://') || url.startsWith('mailto:')) {
-    location.href = url
-    return
-  }
-
-  url = util.cleanPath(url)
-  if (replace) {
-    history.replaceState(null, '', url)
-  } else {
-    history.pushState(null, '', url)
-  }
-  events.emit('popstate', { type: 'popstate', resetScroll: true })
-}

framework/react/mod.ts

@@ -0,0 +1,2 @@
+export * from './hooks.ts'
+export * from './hoc.ts'

import_map.json

@@ -1,7 +1,7 @@
 {
   "imports": {
-    "aleph": "https://deno.land/x/[email protected]/mod.ts",
-    "aleph/": "https://deno.land/x/[email protected]/",
+    "framework": "https://deno.land/x/[email protected]/framework/core/mod.ts",
+    "framework:react": "https://deno.land/x/[email protected]/framework/react/mod.ts",
     "react": "https://esm.sh/[email protected]",
     "react-dom": "https://esm.sh/[email protected]"
   }

mod.ts

@@ -1,5 +1,7 @@
 // custom script for https://deno.land/x/publish
 
+import { defaultReactVersion } from './shared/constants.ts'
+
 export async function prepublish(version: string) {
   const p = Deno.run({
     cmd: ['deno', 'run', '-A', 'build.ts'],
@@ -12,8 +14,10 @@ export async function prepublish(version: string) {
     const data = await Deno.readTextFile('./import_map.json')
     const importMap = JSON.parse(data)
     Object.assign(importMap.imports, {
-      'aleph': `https://deno.land/x/aleph@v${version}/mod.ts`,
-      'aleph/': `https://deno.land/x/aleph@v${version}/`,
+      'framework': `https://deno.land/x/aleph@v${version}/framework/core/mod.ts`,
+      'framework:react': `https://deno.land/x/aleph@v${version}/framework/react/mod.ts`,
+      'react': `https://esm.sh/react@${defaultReactVersion}`,
+      'react-dom': `https://esm.sh/react-dom@${defaultReactVersion}`
     })
     await Deno.writeTextFile(
       './import_map.json',

publish.ts

@@ -137,8 +137,8 @@ export async function loadImportMap(workingDir: string): Promise<ImportMap> {
   if (DEV_PORT) {
     const alephPkgUri = getAlephPkgUri()
     const imports = {
-      'aleph': `${alephPkgUri}/mod.ts`,
-      'aleph/': `${alephPkgUri}/`,
+      'framework': `${alephPkgUri}/framework/core/mod.ts`,
+      'framework:react': `${alephPkgUri}/framework/react/mod.ts`,
       'react': `https://esm.sh/react@${defaultReactVersion}`,
       'react-dom': `https://esm.sh/react-dom@${defaultReactVersion}`,
     }