tidy-up

apps/ssr3/package.json

@@ -20,6 +20,7 @@
     "@fastify/static": "^6.10.1",
     "@fastify/websocket": "^8.0.0",
     "cinnabun": "workspace:^",
+    "cinnabun-cli": "workspace:^",
     "esbuild": "^0.17.18",
     "fastify": "^4.17.0",
     "fastify-plugin": "^4.5.0"

packages/cli/src/build/prebuild.js

@@ -57,11 +57,10 @@ var FileRoutes = () => {
           `new RouteComponent("${transformRoutePath(
             pageRoutes[i],
             true
-          )}", [(props) => Cinnabun.lazy(${r}, props)]),\n      `
+          )}", (props) => Cinnabun.lazy(${r}, props)),\n      `
       )
       .join("")}
   ])
-  )
 }`
   return content
 }

packages/cli/src/build/server.ts

@@ -23,7 +23,6 @@ export function createServer(App: ComponentFunc) {
   })
 
   app.get("/*", async (req, res) => {
-    console.log("req.url: ", req.url)
     const cinnabunInstance = new Cinnabun()
 
     cinnabunInstance.setServerRequestData({

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

@@ -100,15 +100,13 @@ const generateServer = () => ({
 const generateFileRouter = () => ({
   name: "fileRoute-generator-plugin",
   setup(build) {
-    build.onLoad({ filter: /fileRouter\.js?$/ }, async (args) => {
+    build.onLoad({ filter: /fileRouter\.ts?$/ }, async (args) => {
       const contents = await fs.promises.readFile(args.path, "utf8")
 
       const replaced = contents
         .replace("//@ts-expect-error TS2552", "")
         .replace('var FileRoutes = "$FILE_ROUTES"', prebuild())
 
-      console.log("REPLACED", replaced)
-
       return {
         contents: replaced,
         loader: "js",

packages/cli/src/routes/start.ts

@@ -1,6 +1,7 @@
 import { Command, Option } from "commander"
 import esbuild from "esbuild"
 import { generateFileRouter } from "../build/transform-plugin"
+import path from "path"
 
 export default new Command("start")
   .description("start your cinnabun project")
@@ -13,7 +14,9 @@ export default new Command("start")
       stdin: {
         contents: `
           import {App} from "./src/App"
-          import {createServer} from "${__dirname}/../build/server.js"
+          import {createServer} from "${path
+            .join(__dirname, "..", "build", "server.js")
+            .replaceAll(path.sep, "/")}"
           (() => ({
             App,
             createServer

packages/lib/src/lazy.ts

@@ -4,10 +4,12 @@ import { ComponentProps } from "./types"
 
 export const lazy = (
   func: Promise<{ default: any }>,
-  props: Partial<ComponentProps<any>>
+  props: Partial<ComponentProps<any>>,
+  prefetch: boolean = true
 ) => {
   return new SuspenseComponent("", {
     promise: async () => func,
+    prefetch,
     children: [
       (loading: boolean, res: { default: any }) => {
         if (loading) return new FragmentComponent()

packages/lib/src/ssr.ts

@@ -151,7 +151,6 @@ export class SSR {
   }
 
   static render(content: string, config: SSRConfig, accumulator: Accumulator) {
-    console.log("ssr/render", content)
     if (config.stream) {
       config.stream.write(content)
     } else {