remove the tied dependency to @arrow-js

Author: barelyhuman

adex/package.json

@@ -8,9 +8,7 @@
   "exports": {
     "./vite": "./src/vite.js",
     "./utils": "./src/utils.js",
-    "./ssr": "./src/ssr.js",
-    "./html": "./src/html.js",
-    "./reactive": "./src/reactive.js"
+    "./ssr": "./src/ssr.js"
   },
   "publishConfig": {
     "access": "public"

adex/src/html.js

@@ -1,7 +1,9 @@
-import { html } from 'adex/html'
-
 const pageRoutes = import.meta.glob('./pages/**/*.page.{js,ts,jsx,tsx}')
+
 let mounterPath
+
+render()
+
 async function render() {
   const root = document.getElementById('root')
   mounterPath = root.getAttribute('mounter')
@@ -12,15 +14,21 @@ async function render() {
   } catch (err) {
     console.error(err)
   }
-
-  const modImport: any = await pageRoutes[mounterPath]()
+  const pathInPageMap = normalizePath(mounterPath)
+  const modImport: any = await pageRoutes[pathInPageMap]()
   const Page = modImport.default
   const mountable = Page(loaderData)
   root.innerHTML = ''
   mountable(root)
 }
 
-render()
+function normalizePath(path) {
+  let result = String(path)
+  if (/^[./][/]?/.test(result)) {
+    result = result.replace(/^[./][/]?/, '')
+  }
+  return './' + result
+}
 
 if (import.meta.hot) {
   import.meta.hot.accept(mounterPath, newModule => {

adex/src/reactive.js

@@ -116,13 +116,13 @@ async function buildHandler({ routes }) {
         loadedData = 'loader' in mod ? await mod.loader({ req }) : {}
       } catch (err) {
         throw new Error(
-          `Failed to execute loader for url:\`${req.url}\` with page module: \`${hasMappedPage.path}\``
+          `Failed to execute loader for url:\`${req.url}\` with page module: \`${hasMappedPage.relativePath}\``
         )
       }
       const str = renderToString(mod.default(loadedData))
       const html = buildTemplate({
         page: str,
-        mounter: hasMappedPage.path,
+        mounter: hasMappedPage.relativePath,
         clientEntry: clientEntryPath,
         prefillData: loadedData,
       })

adex/src/runtime/client.ts

@@ -1,11 +1,11 @@
 export { default as ms } from 'ms'
 export { default as Youch } from 'youch'
-import { existsSync, readFileSync, statSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 
 import * as routeManifest from '@barelyhuman/fs-route-manifest'
-import { match } from 'path-to-regexp'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { match } from 'path-to-regexp'
 
 export const routerUtils = {
   ...routeManifest,

adex/src/runtime/server.ts

@@ -19,6 +19,7 @@
   },
   "prettier": "@barelyhuman/prettier-config",
   "dependencies": {
+    "@arrow-js/core": "1.0.0-alpha.9",
     "adex": "workspace:*"
   }
 }

adex/src/utils.js

@@ -1,4 +1,4 @@
-import { html } from 'adex/html'
+import { html } from '@arrow-js/core'
 export const loader = ({ req }) => {
   return {
     catch: req.params.catch,

playground/package.json

@@ -1,4 +1,4 @@
-import { html } from 'adex/html'
+import { html } from '@arrow-js/core'
 
 export const loader = ({ req }) => {
   console.log({

playground/src/pages/dynamic/$$catch.page.js

@@ -1,5 +1,5 @@
-import { reactive } from 'adex/reactive'
-import { html } from 'adex/html'
+import { reactive } from '@arrow-js/core'
+import { html } from '@arrow-js/core'
 
 export const loader = async () => {
   return {