fix everything

apps/ssr3/build.js

@@ -27,14 +27,14 @@ const sharedSettings = {
 Promise.all([
   esbuild.build({
     sourcemap: "linked",
-    entryPoints: ["./.cb/src/server/index.ts"],
+    entryPoints: ["./src/server/index.ts"],
     outdir: "dist/server",
     platform: "node",
     ...sharedSettings,
     plugins: [generateFileRouter()],
   }),
   esbuild.build({
-    entryPoints: ["./.cb/src/client/index.ts"],
+    entryPoints: ["./src/client/index.ts"],
     outdir: "dist/static",
     splitting: true,
     ...sharedSettings,

packages/cli/src/build/prebuild.js

@@ -46,22 +46,21 @@ const createFileRouter = (routes) => {
   )
   const content = `import * as Cinnabun from "../../"
 import { Cinnabun as cb, createSignal } from "../../../"
-import { Route, Router } from "../"
+import { RouteComponent, RouterComponent } from "../"
 const pathStore = createSignal(cb.isClient ? window.location.pathname : "/")
 
 var FileRoutes = () => {
-  return (
-    <Router store={pathStore}>
+  return new RouterComponent(pathStore, [
     ${routeImports
       .map(
         (r, i) =>
-          `<Route path="${transformRoutePath(
+          `new RouteComponent("${transformRoutePath(
             pageRoutes[i],
             true
-          )}" component={(props) => Cinnabun.lazy(${r}, props)} />\n      `
+          )}", [(props) => Cinnabun.lazy(${r}, props)]),\n      `
       )
       .join("")}
-  </Router>
+  ])
   )
 }`
   return content

packages/cli/src/build/transform-plugin.js

@@ -105,11 +105,13 @@ const generateFileRouter = () => ({
 
       const replaced = contents
         .replace("//@ts-expect-error TS2552", "")
-        .replace("var FileRoutes = $FILE_ROUTES", prebuild())
+        .replace('var FileRoutes = "$FILE_ROUTES"', prebuild())
+
+      console.log("REPLACED", replaced)
 
       return {
         contents: replaced,
-        loader: "jsx",
+        loader: "js",
       }
     })
   },

packages/cli/src/routes/start.ts

@@ -1,6 +1,6 @@
 import { Command, Option } from "commander"
 import esbuild from "esbuild"
-import { generateFileRouter, generateServer } from "../build/transform-plugin"
+import { generateFileRouter } from "../build/transform-plugin"
 
 export default new Command("start")
   .description("start your cinnabun project")
@@ -9,16 +9,6 @@ export default new Command("start")
     new Option("-h, --host <host>", "host to run on").default("localhost")
   )
   .action(async ({ port }) => {
-    // await Promise.all([buildServer(), buildClient()])
-
-    /*
-
-
-    
-    
-    export {default as App} from "./src/App.tsx"
-          export * from "${__dirname}/../build/server.js"
-          */
     const result = await esbuild.build({
       stdin: {
         contents: `

packages/lib/src/router/generated/fileRouter.ts

@@ -0,0 +1,5 @@
+var FileRoutes = "$FILE_ROUTES"
+
+export const FileRouter = () => {
+  return FileRoutes
+}

packages/lib/src/router/router.ts

@@ -5,7 +5,7 @@ import { Cinnabun } from "../cinnabun"
 import { DomInterop } from "../domInterop"
 import { ComponentChild, PropsSetter, RouteProps } from "../types"
 
-class RouteComponent extends Component<any> {
+export class RouteComponent extends Component<any> {
   constructor(path: string, component: ComponentChild) {
     super("", {
       path,