update latest

Author: omridevk

e2e/react-start/custom-manifest-base/src/server.ts

@@ -10,7 +10,7 @@ const customHandler = defineHandlerCallback((ctx) => {
   return defaultStreamHandler(ctx)
 })
 
-const fetch = createStartHandler(customHandler, {basePath: 'http://localhost:3001'})
+const fetch = createStartHandler(customHandler, {assetsUrl: 'http://localhost:3001'})
 
 export default {
   fetch

packages/start-plugin-core/src/schema.ts

@@ -129,6 +129,7 @@ const pageSchema = pageBaseSchema.extend({
 const tanstackStartOptionsSchema = z
   .object({
     srcDirectory: z.string().optional().default('src'),
+    assetsUrl: z.string().optional(),
     start: z
       .object({
         entry: z.string().optional(),

packages/start-server-core/src/createStartHandler.ts

@@ -53,7 +53,7 @@ function getStartResponseHeaders(opts: { router: AnyRouter }) {
 
 export function createStartHandler<TRegister = Register>(
   cb: HandlerCallback<AnyRouter>,
-  opts: {basePath?: string} = {}
+  opts: {assetsUrl?: string} = {}
 ): RequestHandler<TRegister> {
   const ROUTER_BASEPATH = process.env.TSS_ROUTER_BASEPATH || '/'
   let startRoutesManifest: Manifest | null = null

packages/start-server-core/src/router-manifest.ts

@@ -1,15 +1,14 @@
 import { rootRouteId } from '@tanstack/router-core'
 import { VIRTUAL_MODULES } from './virtual-modules'
 import { loadVirtualModule } from './loadVirtualModule'
-import path from 'node:path'
 
 /**
  * @description Returns the router manifest that should be sent to the client.
  * This includes only the assets and preloads for the current route and any
  * special assets that are needed for the client. It does not include relationships
  * between routes or any other data that is not needed for the client.
  */
-export async function getStartManifest({basePath = '', routerBasePath}: { basePath?: string, routerBasePath?: string } = {}) {
+export async function getStartManifest({assetsUrl: maybeAssetsUrl, routerBasePath}: { assetsUrl?: string, routerBasePath?: string } = {}) {
   const { tsrStartManifest } = await loadVirtualModule(
     VIRTUAL_MODULES.startManifest,
   )
@@ -19,7 +18,9 @@ export async function getStartManifest({basePath = '', routerBasePath}: { basePa
     startManifest.routes[rootRouteId] || {})
 
   rootRoute.assets = rootRoute.assets || []
-  let script = `import('${basePath + "/" + startManifest.clientEntry.replace(routerBasePath ?? '', '')}')`
+  let script =
+    maybeAssetsUrl ?
+    `import('${maybeAssetsUrl + "/" + startManifest.clientEntry.replace(routerBasePath ?? '', '')}')` : `import('${startManifest.clientEntry}')`
   if (process.env.TSS_DEV_SERVER === 'true') {
     const { injectedHeadScripts } = await loadVirtualModule(
       VIRTUAL_MODULES.injectedHeadScripts,
@@ -43,20 +44,27 @@ export async function getStartManifest({basePath = '', routerBasePath}: { basePa
     routes: Object.fromEntries(
       Object.entries(startManifest.routes).map(([k, v]) => {
         const { preloads, assets } = v
-        console.log({k, preloads, assets})
+        if (!maybeAssetsUrl) {
+          return [
+            k,
+            {
+              preloads,
+              assets,
+            },
+          ]
+        }
         return [
           k,
           {
-            preloads: preloads?.map((url) => basePath + '/' + url.replace(routerBasePath ?? '', '')) || [],
+            preloads: preloads?.map((url) => maybeAssetsUrl + '/' + url.replace(routerBasePath ?? '', '')) || [],
             assets:
               assets?.map((asset) => {
-                console.log(asset)
                 if (asset.tag === 'link' && asset.attrs?.href) {
                   return {
                     ...asset,
                     attrs: {
                       ...asset.attrs,
-                      href: basePath + '/' + asset.attrs.href,
+                      href: maybeAssetsUrl + '/' + asset.attrs.href,
                     },
                   }
                 }