move createServerRpc into start-server-core

Author: schiller-manuel

labeler-config.yml

@@ -82,9 +82,6 @@
 'package: start-server-core':
   - changed-files:
       - any-glob-to-any-file: 'packages/start-server-core/**/*'
-'package: start-server-functions-server':
-  - changed-files:
-      - any-glob-to-any-file: 'packages/start-server-functions-server/**/*'
 'package: start-static-server-functions':
   - changed-files:
       - any-glob-to-any-file: 'packages/start-static-server-functions/**/*'

package.json

@@ -103,7 +103,6 @@
       "@tanstack/solid-start": "workspace:*",
       "@tanstack/solid-start-client": "workspace:*",
       "@tanstack/solid-start-server": "workspace:*",
-      "@tanstack/start-server-functions-server": "workspace:*",
       "@tanstack/start-plugin-core": "workspace:*",
       "@tanstack/start-client-core": "workspace:*",
       "@tanstack/start-server-core": "workspace:*",

packages/react-start/package.json

@@ -56,12 +56,6 @@
         "default": "./dist/esm/plugin/vite.js"
       }
     },
-    "./server-functions-server": {
-      "import": {
-        "types": "./dist/esm/server-functions-server.d.ts",
-        "default": "./dist/esm/server-functions-server.js"
-      }
-    },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
@@ -75,7 +69,6 @@
   "dependencies": {
     "@tanstack/react-start-client": "workspace:*",
     "@tanstack/react-start-server": "workspace:*",
-    "@tanstack/start-server-functions-server": "workspace:*",
     "@tanstack/router-utils": "workspace:^",
     "@tanstack/start-plugin-core": "workspace:*",
     "pathe": "^2.0.3"

packages/react-start/src/server-functions-server.tsx

@@ -22,16 +22,10 @@ export default mergeConfig(
   config,
   tanstackViteConfig({
     srcDir: './src',
-    entry: [
-      './src/client.tsx',
-      './src/server.tsx',
-      './src/plugin/vite.ts',
-      './src/server-functions-server.tsx',
-    ],
+    entry: ['./src/client.tsx', './src/server.tsx', './src/plugin/vite.ts'],
     externalDeps: [
       '@tanstack/react-start-client',
       '@tanstack/react-start-server',
-      '@tanstack/start-server-functions-server',
     ],
     exclude: ['./src/plugin/default-entry'],
     cjs: false,

packages/react-start/vite.config.ts

@@ -56,12 +56,6 @@
         "default": "./dist/esm/plugin/vite.js"
       }
     },
-    "./server-functions-server": {
-      "import": {
-        "types": "./dist/esm/server-functions-server.d.ts",
-        "default": "./dist/esm/server-functions-server.js"
-      }
-    },
     "./package.json": "./package.json"
   },
   "sideEffects": false,
@@ -75,7 +69,6 @@
   "dependencies": {
     "@tanstack/solid-start-client": "workspace:*",
     "@tanstack/solid-start-server": "workspace:*",
-    "@tanstack/start-server-functions-server": "workspace:*",
     "@tanstack/start-plugin-core": "workspace:*",
     "pathe": "^2.0.3"
   },

packages/solid-start/package.json

@@ -22,16 +22,10 @@ export default mergeConfig(
   config,
   tanstackViteConfig({
     srcDir: './src',
-    entry: [
-      './src/client.tsx',
-      './src/server.tsx',
-      './src/plugin/vite.ts',
-      './src/server-functions-server.tsx',
-    ],
+    entry: ['./src/client.tsx', './src/server.tsx', './src/plugin/vite.ts'],
     externalDeps: [
       '@tanstack/solid-start-client',
       '@tanstack/solid-start-server',
-      '@tanstack/start-server-functions-server',
     ],
     cjs: false,
     exclude: ['./src/plugin/default-entry'],

packages/solid-start/src/server-functions-server.tsx

@@ -223,7 +223,7 @@ export function TanStackStartVitePluginCore(
                   ...Object.values(VIRTUAL_MODULES),
                   ...result.optimizeDeps.exclude.sort(),
                   ...additionalOptimizeDeps.exclude,
-                  `@tanstack/${corePluginOpts.framework}-start/server-functions-server`,
+                  `@tanstack/${corePluginOpts.framework}-start/server`,
                 ],
                 include: [
                   ...additionalOptimizeDeps.include,
@@ -312,7 +312,7 @@ export function TanStackStartVitePluginCore(
       },
       server: {
         getRuntimeCode: () =>
-          `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server-functions-server'`,
+          `import { createServerRpc } from '@tanstack/${corePluginOpts.framework}-start/server'`,
         replacer: (d) => `createServerRpc('${d.functionId}', ${d.fn})`,
         envName: VITE_ENVIRONMENT_NAMES.server,
       },

packages/solid-start/vite.config.ts

@@ -0,0 +1,28 @@
+import invariant from 'tiny-invariant'
+
+let baseUrl: string
+function sanitizeBase(base: string) {
+  return base.replace(/^\/|\/$/g, '')
+}
+
+export const createServerRpc = (
+  functionId: string,
+  splitImportFn: (...args: any) => any,
+) => {
+  if (!baseUrl) {
+    const sanitizedAppBase = sanitizeBase(process.env.TSS_APP_BASE || '/')
+    const sanitizedServerBase = sanitizeBase(process.env.TSS_SERVER_FN_BASE!)
+    baseUrl = `${sanitizedAppBase ? `/${sanitizedAppBase}` : ''}/${sanitizedServerBase}/`
+  }
+  invariant(
+    splitImportFn,
+    '🚨splitImportFn required for the server functions server runtime, but was not provided.',
+  )
+
+  const url = baseUrl + functionId
+
+  return Object.assign(splitImportFn, {
+    url,
+    functionId,
+  })
+}