only inherit base if not a full url

schiller-manuel · schiller-manuel · commit c79ff93d80e5 · 2025-10-03T13:44:53.000+02:00
apply the same to nitro-vite2-plugin
diff --git a/packages/nitro-v2-vite-plugin/src/index.ts b/packages/nitro-v2-vite-plugin/src/index.ts
@@ -1,13 +1,23 @@
 import { build, copyPublicAssets, createNitro, prepare } from 'nitropack'
 import { dirname, resolve } from 'pathe'
 
-import type { PluginOption, Rollup } from 'vite'
+import type { PluginOption, ResolvedConfig, Rollup } from 'vite'
 import type { NitroConfig } from 'nitropack'
 
 let ssrBundle: Rollup.OutputBundle
 let ssrEntryFile: string
 
+function isFullUrl(str: string): boolean {
+  try {
+    new URL(str)
+    return true
+  } catch {
+    return false
+  }
+}
+
 export function nitroV2Plugin(nitroConfig?: NitroConfig): Array<PluginOption> {
+  let resolvedConfig: ResolvedConfig
   return [
     {
       name: 'tanstack-nitro-v2-vite-plugin',
@@ -42,7 +52,10 @@ export function nitroV2Plugin(nitroConfig?: NitroConfig): Array<PluginOption> {
         },
       },
 
-      async config(_, env) {
+      configResolved(config) {
+        resolvedConfig = config
+      },
+      config(_, env) {
         if (env.command !== 'build') {
           return
         }
@@ -81,15 +94,18 @@ export function nitroV2Plugin(nitroConfig?: NitroConfig): Array<PluginOption> {
               await builder.build(server)
 
               const virtualEntry = '#tanstack/start/entry'
+              const baseURL = !isFullUrl(resolvedConfig.base)
+                ? resolvedConfig.base
+                : undefined
               const config: NitroConfig = {
-                ...nitroConfig,
+                baseURL,
                 publicAssets: [
                   {
                     dir: client.config.build.outDir,
-                    baseURL: '/',
                     maxAge: 31536000, // 1 year
                   },
                 ],
+                ...nitroConfig,
                 renderer: virtualEntry,
                 rollupConfig: {
                   ...nitroConfig?.rollupConfig,
diff --git a/packages/start-plugin-core/src/plugin.ts b/packages/start-plugin-core/src/plugin.ts
@@ -48,6 +48,16 @@ export type GetConfigFn = () => {
   startConfig: TanStackStartOutputConfig
   resolvedStartConfig: ResolvedStartConfig
 }
+
+function isFullUrl(str: string): boolean {
+  try {
+    new URL(str)
+    return true
+  } catch {
+    return false
+  }
+}
+
 export function TanStackStartVitePluginCore(
   corePluginOpts: TanStackStartVitePluginCoreOptions,
   startPluginOpts: TanStackStartInputConfig,
@@ -98,12 +108,13 @@ export function TanStackStartVitePluginCore(
 
         const { startConfig } = getConfig()
         if (startConfig.router.basepath === undefined) {
-          startConfig.router.basepath = resolvedStartConfig.viteAppBase
+          if (!isFullUrl(resolvedStartConfig.viteAppBase)) {
+            startConfig.router.basepath =
+              resolvedStartConfig.viteAppBase.replace(/^\/|\/$/g, '')
+          } else {
+            startConfig.router.basepath = '/'
+          }
         }
-        startConfig.router.basepath = startConfig.router.basepath.replace(
-          /^\/|\/$/g,
-          '',
-        )
 
         const TSS_SERVER_FN_BASE = joinPaths([
           '/',
