feat: client first

adex/runtime/client.js

@@ -23,13 +23,14 @@ const withComponents = routes.map(d => {
 function ComponentWrapper({ url = '' }) {
   return h(
     LocationProvider,
+    //@ts-expect-error no types for non-jsx function
     { url: url },
     h(
       ErrorBoundary,
       {},
       h(
         Router,
-        { url: url },
+        {},
         withComponents.map(d =>
           h(Route, { path: d.routePath, component: d.component })
         )

adex/runtime/handler.js

@@ -1,7 +1,6 @@
 import { CONSTANTS, emitToHooked } from 'adex/hook'
 import { prepareRequest, prepareResponse } from 'adex/http'
 import { toStatic } from 'adex/ssr'
-import { LocationProvider, ErrorBoundary, Router } from 'adex/router'
 import { renderToString } from 'adex/utils/isomorphic'
 import { h } from 'preact'
 
@@ -21,7 +20,8 @@ export async function handler(req, res) {
   prepareRequest(req)
   prepareResponse(res)
 
-  const [baseURL] = req.url.split('?')
+  const [url, search] = req.url.split('?')
+  const baseURL = normalizeRequestUrl(url)
 
   const { metas, links, title, lang } = toStatic()
 
@@ -60,7 +60,9 @@ export async function handler(req, res) {
     // @ts-expect-error
     global.location = new URL(req.url, 'http://localhost')
 
-    const rendered = await renderToString(h(App, { url: req.url }))
+    const rendered = await renderToString(
+      h(App, { url: [baseURL, search].filter(Boolean).join('?') })
+    )
 
     const htmlString = HTMLTemplate({
       metas,
@@ -148,3 +150,7 @@ const stringify = (title, metas, links) => {
     ${stringifyTag('link', links)}
   `
 }
+
+function normalizeRequestUrl(url) {
+  return url.replace(/\/(index\.html)$/, '/')
+}

adex/src/fonts.js

@@ -49,7 +49,7 @@ export function fonts({ providers = [], families = [] } = {}) {
     },
     async transform(code, id) {
       const resolvedData = await this.resolve('virtual:adex:client')
-      if (id === resolvedData.id) {
+      if (resolvedData?.id == id) {
         return {
           code: `import "${fontVirtualId}";\n` + code,
         }