@tanstack/solid-start 2.0.0-beta.20 → 2.0.0-beta.21

package/dist/default-entry/esm/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","names":[],"sources":["../../../src/default-entry/server.ts"],"sourcesContent":["import {\n  createStartHandler,\n  defaultStreamHandler,\n} from '@tanstack/solid-start/server'\nimport type { Register } from '@tanstack/solid-router'\nimport type { RequestHandler } from '@tanstack/solid-start/server'\n\nconst fetch = createStartHandler(defaultStreamHandler)\n\n// Providing `RequestHandler` from `@tanstack/solid-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`\nexport type ServerEntry = { fetch: RequestHandler<Register> }\n\nexport function createServerEntry(entry: ServerEntry): ServerEntry {\n  return {\n    async fetch(...args) {\n      return await entry.fetch(...args)\n    },\n  }\n}\n\nexport default createServerEntry({ fetch })\n"],"mappings":";;AAOA,IAAM,QAAQ,mBAAmB,qBAAqB;AAKtD,SAAgB,kBAAkB,OAAiC;AACjE,QAAO,EACL,MAAM,MAAM,GAAG,MAAM;AACnB,SAAO,MAAM,MAAM,MAAM,GAAG,KAAK;IAEpC;;AAGH,IAAA,iBAAe,kBAAkB,EAAE,OAAO,CAAC"}
+{"version":3,"file":"server.js","names":[],"sources":["../../../src/default-entry/server.ts"],"sourcesContent":["import {\n  createStartHandler,\n  defaultStreamHandler,\n} from '@tanstack/solid-start/server'\nimport type { Register } from '@tanstack/solid-router'\nimport type { RequestHandler } from '@tanstack/solid-start/server'\n\nconst fetch = createStartHandler(defaultStreamHandler)\n\n// Providing `RequestHandler` from `@tanstack/solid-start/server` is required so that the output types don't import it from `@tanstack/start-server-core`\nexport type ServerEntry = { fetch: RequestHandler<Register> }\n\nexport function createServerEntry(entry: ServerEntry): ServerEntry {\n  return {\n    async fetch(...args) {\n      return await entry.fetch(...args)\n    },\n  }\n}\n\nexport default createServerEntry({ fetch })\n"],"mappings":";;AAOA,IAAM,QAAQ,mBAAmB,oBAAoB;AAKrD,SAAgB,kBAAkB,OAAiC;CACjE,OAAO,EACL,MAAM,MAAM,GAAG,MAAM;EACnB,OAAO,MAAM,MAAM,MAAM,GAAG,IAAI;CAClC,EACF;AACF;AAEA,IAAA,iBAAe,kBAAkB,EAAE,MAAM,CAAC"}

package/dist/esm/hydration.d.ts

@@ -0,0 +1,2 @@
+export { condition, idle, interaction, load, media, never, visible, } from '@tanstack/solid-start-client/hydration';
+export type { HydrationCondition, HydrationInteractionEvent, HydrationInteractionEvents, HydrationPrefetchStrategy, HydrationStrategy, HydrationWhen, VisibleHydrationOptions, } from '@tanstack/solid-start-client/hydration';

package/dist/esm/hydration.js

@@ -0,0 +1,2 @@
+import { condition, idle, interaction, load, media, never, visible } from "@tanstack/solid-start-client/hydration";
+export { condition, idle, interaction, load, media, never, visible };

package/dist/esm/index.d.ts

@@ -1,2 +1,5 @@
 export { useServerFn } from './useServerFn.js';
 export * from '@tanstack/start-client-core';
+export { createClientOnlyFn, createCsrfMiddleware, createIsomorphicFn, createMiddleware, createServerFn, createServerOnlyFn, createStart, } from '@tanstack/start-client-core';
+export { Hydrate } from '@tanstack/solid-start-client/Hydrate';
+export type { HydrateOptions, HydrateProps, HydrationInteractionEvent, HydrationInteractionEvents, HydrationPrefetchStrategy, HydrationStrategy, HydrationWhen, } from '@tanstack/solid-start-client/Hydrate';

package/dist/esm/index.js

@@ -1,3 +1,5 @@
 import { useServerFn } from "./useServerFn.js";
+import { createClientOnlyFn, createCsrfMiddleware, createIsomorphicFn, createMiddleware, createServerFn, createServerOnlyFn, createStart } from "@tanstack/start-client-core";
+import { Hydrate } from "@tanstack/solid-start-client/Hydrate";
 export * from "@tanstack/start-client-core";
-export { useServerFn };
+export { Hydrate, createClientOnlyFn, createCsrfMiddleware, createIsomorphicFn, createMiddleware, createServerFn, createServerOnlyFn, createStart, useServerFn };

package/dist/esm/plugin/rsbuild.d.ts

@@ -0,0 +1,3 @@
+import { TanStackStartRsbuildInputConfig } from '@tanstack/start-plugin-core/rsbuild';
+import { RsbuildPlugin } from '@rsbuild/core';
+export declare function tanstackStart(options?: TanStackStartRsbuildInputConfig): RsbuildPlugin;

package/dist/esm/plugin/rsbuild.js

@@ -0,0 +1,44 @@
+import { solidStartDefaultEntryPaths } from "./shared.js";
+import { RSBUILD_ENVIRONMENT_NAMES, tanStackStartRsbuild } from "@tanstack/start-plugin-core/rsbuild";
+//#region src/plugin/rsbuild.ts
+function tanstackStart(options) {
+	const basePlugin = tanStackStartRsbuild({
+		framework: "solid",
+		defaultEntryPaths: solidStartDefaultEntryPaths,
+		providerEnvironmentName: RSBUILD_ENVIRONMENT_NAMES.server,
+		ssrIsProvider: true,
+		rsbuild: { environments: { all: { resolve: { conditionNames: ["solid", "..."] } } } }
+	}, options);
+	return {
+		name: "tanstack-solid-start-rsbuild",
+		setup(api) {
+			basePlugin.setup(api);
+			api.modifyBundlerChain(async (chain, { CHAIN_ID, target }) => {
+				for (const ruleId of [
+					CHAIN_ID.RULE.JS,
+					CHAIN_ID.RULE.JS_DATA_URI,
+					"babel-js"
+				]) {
+					if (!chain.module.rules.has(ruleId)) continue;
+					const rule = chain.module.rule(ruleId);
+					if (!rule.uses.has(CHAIN_ID.USE.BABEL)) continue;
+					rule.use(CHAIN_ID.USE.BABEL).tap((babelOptions) => {
+						babelOptions.presets = (babelOptions.presets ?? []).map((preset) => {
+							if (Array.isArray(preset) && typeof preset[0] === "string" && preset[0].includes("babel-preset-solid")) return [preset[0], {
+								...preset[1] ?? {},
+								hydratable: true,
+								generate: target === "node" ? "ssr" : "dom"
+							}];
+							return preset;
+						});
+						return babelOptions;
+					});
+				}
+			});
+		}
+	};
+}
+//#endregion
+export { tanstackStart };
+
+//# sourceMappingURL=rsbuild.js.map

package/dist/esm/plugin/rsbuild.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rsbuild.js","names":[],"sources":["../../../src/plugin/rsbuild.ts"],"sourcesContent":["import {\n  RSBUILD_ENVIRONMENT_NAMES,\n  tanStackStartRsbuild,\n} from '@tanstack/start-plugin-core/rsbuild'\nimport { solidStartDefaultEntryPaths } from './shared'\nimport type {\n  TanStackStartRsbuildInputConfig,\n  TanStackStartRsbuildPluginCoreOptions,\n} from '@tanstack/start-plugin-core/rsbuild'\nimport type { RsbuildPlugin } from '@rsbuild/core'\n\nexport function tanstackStart(\n  options?: TanStackStartRsbuildInputConfig,\n): RsbuildPlugin {\n  const corePluginOpts: TanStackStartRsbuildPluginCoreOptions = {\n    framework: 'solid',\n    defaultEntryPaths: solidStartDefaultEntryPaths,\n    providerEnvironmentName: RSBUILD_ENVIRONMENT_NAMES.server,\n    ssrIsProvider: true,\n    rsbuild: {\n      environments: {\n        all: {\n          resolve: {\n            conditionNames: ['solid', '...'],\n          },\n        },\n      },\n    },\n  }\n\n  const basePlugin = tanStackStartRsbuild(corePluginOpts, options)\n\n  return {\n    name: 'tanstack-solid-start-rsbuild',\n    setup(api) {\n      basePlugin.setup(api)\n\n      api.modifyBundlerChain(async (chain, { CHAIN_ID, target }) => {\n        for (const ruleId of [\n          CHAIN_ID.RULE.JS,\n          CHAIN_ID.RULE.JS_DATA_URI,\n          'babel-js',\n        ]) {\n          if (!chain.module.rules.has(ruleId)) {\n            continue\n          }\n\n          const rule = chain.module.rule(ruleId)\n          if (!rule.uses.has(CHAIN_ID.USE.BABEL)) {\n            continue\n          }\n\n          rule.use(CHAIN_ID.USE.BABEL).tap((babelOptions) => {\n            babelOptions.presets = (babelOptions.presets ?? []).map(\n              (preset: unknown) => {\n                if (\n                  Array.isArray(preset) &&\n                  typeof preset[0] === 'string' &&\n                  preset[0].includes('babel-preset-solid')\n                ) {\n                  return [\n                    preset[0],\n                    {\n                      ...(preset[1] ?? {}),\n                      hydratable: true,\n                      generate: target === 'node' ? 'ssr' : 'dom',\n                    },\n                  ]\n                }\n\n                return preset\n              },\n            )\n\n            return babelOptions\n          })\n        }\n      })\n    },\n  }\n}\n"],"mappings":";;;AAWA,SAAgB,cACd,SACe;CAiBf,MAAM,aAAa,qBAAqB;EAftC,WAAW;EACX,mBAAmB;EACnB,yBAAyB,0BAA0B;EACnD,eAAe;EACf,SAAS,EACP,cAAc,EACZ,KAAK,EACH,SAAS,EACP,gBAAgB,CAAC,SAAS,KAAK,EACjC,EACF,EACF,EACF;CAGsC,GAAgB,OAAO;CAE/D,OAAO;EACL,MAAM;EACN,MAAM,KAAK;GACT,WAAW,MAAM,GAAG;GAEpB,IAAI,mBAAmB,OAAO,OAAO,EAAE,UAAU,aAAa;IAC5D,KAAK,MAAM,UAAU;KACnB,SAAS,KAAK;KACd,SAAS,KAAK;KACd;IACF,GAAG;KACD,IAAI,CAAC,MAAM,OAAO,MAAM,IAAI,MAAM,GAChC;KAGF,MAAM,OAAO,MAAM,OAAO,KAAK,MAAM;KACrC,IAAI,CAAC,KAAK,KAAK,IAAI,SAAS,IAAI,KAAK,GACnC;KAGF,KAAK,IAAI,SAAS,IAAI,KAAK,EAAE,KAAK,iBAAiB;MACjD,aAAa,WAAW,aAAa,WAAW,CAAC,GAAG,KACjD,WAAoB;OACnB,IACE,MAAM,QAAQ,MAAM,KACpB,OAAO,OAAO,OAAO,YACrB,OAAO,GAAG,SAAS,oBAAoB,GAEvC,OAAO,CACL,OAAO,IACP;QACE,GAAI,OAAO,MAAM,CAAC;QAClB,YAAY;QACZ,UAAU,WAAW,SAAS,QAAQ;OACxC,CACF;OAGF,OAAO;MACT,CACF;MAEA,OAAO;KACT,CAAC;IACH;GACF,CAAC;EACH;CACF;AACF"}

package/dist/esm/plugin/shared.d.ts

@@ -0,0 +1,5 @@
+export declare const solidStartDefaultEntryPaths: {
+    client: string;
+    server: string;
+    start: string;
+};

package/dist/esm/plugin/shared.js

@@ -0,0 +1,14 @@
+import { fileURLToPath } from "node:url";
+import path from "pathe";
+//#region src/plugin/shared.ts
+var currentDir = path.dirname(fileURLToPath(import.meta.url));
+var defaultEntryDir = path.resolve(currentDir, "..", "..", "plugin", "default-entry");
+var solidStartDefaultEntryPaths = {
+	client: path.resolve(defaultEntryDir, "client.tsx"),
+	server: path.resolve(defaultEntryDir, "server.ts"),
+	start: path.resolve(defaultEntryDir, "start.ts")
+};
+//#endregion
+export { solidStartDefaultEntryPaths };
+
+//# sourceMappingURL=shared.js.map

package/dist/esm/plugin/shared.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared.js","names":[],"sources":["../../../src/plugin/shared.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url'\nimport path from 'pathe'\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url))\nconst defaultEntryDir = path.resolve(\n  currentDir,\n  '..',\n  '..',\n  'plugin',\n  'default-entry',\n)\n\nexport const solidStartDefaultEntryPaths = {\n  client: path.resolve(defaultEntryDir, 'client.tsx'),\n  server: path.resolve(defaultEntryDir, 'server.ts'),\n  start: path.resolve(defaultEntryDir, 'start.ts'),\n}\n"],"mappings":";;;AAGA,IAAM,aAAa,KAAK,QAAQ,cAAc,OAAO,KAAK,GAAG,CAAC;AAC9D,IAAM,kBAAkB,KAAK,QAC3B,YACA,MACA,MACA,UACA,eACF;AAEA,IAAa,8BAA8B;CACzC,QAAQ,KAAK,QAAQ,iBAAiB,YAAY;CAClD,QAAQ,KAAK,QAAQ,iBAAiB,WAAW;CACjD,OAAO,KAAK,QAAQ,iBAAiB,UAAU;AACjD"}

package/dist/esm/plugin/vite.d.ts

@@ -1,3 +1,3 @@
-import { TanStackStartInputConfig } from '@tanstack/start-plugin-core';
+import { TanStackStartViteInputConfig } from '@tanstack/start-plugin-core/vite';
 import { PluginOption } from 'vite';
-export declare function tanstackStart(options?: TanStackStartInputConfig): Array<PluginOption>;
+export declare function tanstackStart(options?: TanStackStartViteInputConfig): Array<PluginOption>;

package/dist/esm/plugin/vite.js

@@ -1,34 +1,36 @@
-import { fileURLToPath } from "node:url";
-import { TanStackStartVitePluginCore, VITE_ENVIRONMENT_NAMES } from "@tanstack/start-plugin-core";
-import path from "pathe";
+import { solidStartDefaultEntryPaths } from "./shared.js";
+import { START_ENVIRONMENT_NAMES, tanStackStartVite } from "@tanstack/start-plugin-core/vite";
 //#region src/plugin/vite.ts
-var currentDir = path.dirname(fileURLToPath(import.meta.url));
-var defaultEntryDir = path.resolve(currentDir, "..", "..", "plugin", "default-entry");
-var defaultEntryPaths = {
-	client: path.resolve(defaultEntryDir, "client.tsx"),
-	server: path.resolve(defaultEntryDir, "server.ts"),
-	start: path.resolve(defaultEntryDir, "start.ts")
-};
 function tanstackStart(options) {
 	return [{
 		name: "tanstack-solid-start:config",
 		config() {
-			return { resolve: { dedupe: [
-				"solid-js",
-				"@solidjs/web",
-				"@solidjs/signals"
-			] } };
+			return {
+				resolve: { dedupe: [
+					"solid-js",
+					"@solidjs/web",
+					"@solidjs/signals"
+				] },
+				ssr: { noExternal: [
+					"@tanstack/solid-router-ssr-query",
+					"@tanstack/solid-query",
+					"@tanstack/solid-query-devtools"
+				] }
+			};
 		},
 		configEnvironment(environmentName, options) {
-			return { optimizeDeps: environmentName === VITE_ENVIRONMENT_NAMES.client || environmentName === VITE_ENVIRONMENT_NAMES.server && options.optimizeDeps?.noDiscovery === false ? { exclude: [
+			return { optimizeDeps: environmentName === START_ENVIRONMENT_NAMES.client || environmentName === START_ENVIRONMENT_NAMES.server && options.optimizeDeps?.noDiscovery === false ? { exclude: [
 				"@tanstack/solid-start",
 				"@tanstack/solid-router",
 				"@tanstack/start-static-server-functions"
 			] } : void 0 };
 		}
-	}, TanStackStartVitePluginCore({
+	}, tanStackStartVite({
 		framework: "solid",
-		defaultEntryPaths
+		defaultEntryPaths: solidStartDefaultEntryPaths,
+		providerEnvironmentName: START_ENVIRONMENT_NAMES.server,
+		ssrIsProvider: true,
+		ssrResolverStrategy: { type: "default" }
 	}, options)];
 }
 //#endregion

package/dist/esm/plugin/vite.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite.js","names":[],"sources":["../../../src/plugin/vite.ts"],"sourcesContent":["import { fileURLToPath } from 'node:url'\nimport {\n  TanStackStartVitePluginCore,\n  VITE_ENVIRONMENT_NAMES,\n} from '@tanstack/start-plugin-core'\nimport path from 'pathe'\nimport type { TanStackStartInputConfig } from '@tanstack/start-plugin-core'\nimport type { PluginOption } from 'vite'\n\nconst currentDir = path.dirname(fileURLToPath(import.meta.url))\nconst defaultEntryDir = path.resolve(\n  currentDir,\n  '..',\n  '..',\n  'plugin',\n  'default-entry',\n)\nconst defaultEntryPaths = {\n  client: path.resolve(defaultEntryDir, 'client.tsx'),\n  server: path.resolve(defaultEntryDir, 'server.ts'),\n  start: path.resolve(defaultEntryDir, 'start.ts'),\n}\n\nexport function tanstackStart(\n  options?: TanStackStartInputConfig,\n): Array<PluginOption> {\n  return [\n    {\n      name: 'tanstack-solid-start:config',\n      config() {\n        // Ensure a single copy of Solid runtime packages is used across the\n        // app, the router, and the auto-injected default client/server entries.\n        // Without this, mixed pnpm resolutions (e.g. `@solidjs/web` beta.6\n        // linked into `@tanstack/solid-start`'s node_modules vs. beta.7 in the\n        // user's project) cause two parallel runtimes to be bundled. Two\n        // `_$HY.done` setters then race, causing `hydrate()` to early-return\n        // into non-hydrating render mode and breaking client interactivity.\n        return {\n          resolve: {\n            dedupe: ['solid-js', '@solidjs/web', '@solidjs/signals'],\n          },\n        }\n      },\n      configEnvironment(environmentName, options) {\n        return {\n          optimizeDeps:\n            environmentName === VITE_ENVIRONMENT_NAMES.client ||\n            (environmentName === VITE_ENVIRONMENT_NAMES.server &&\n              // This indicates that the server environment has opted in to dependency optimization\n              options.optimizeDeps?.noDiscovery === false)\n              ? {\n                  // As `@tanstack/solid-start` depends on `@tanstack/solid-router`, we should exclude both.\n                  exclude: [\n                    '@tanstack/solid-start',\n                    '@tanstack/solid-router',\n                    '@tanstack/start-static-server-functions',\n                  ],\n                }\n              : undefined,\n        }\n      },\n    },\n    TanStackStartVitePluginCore(\n      {\n        framework: 'solid',\n        defaultEntryPaths,\n      },\n      options,\n    ),\n  ]\n}\n"],"mappings":";;;;AASA,IAAM,aAAa,KAAK,QAAQ,cAAc,OAAO,KAAK,IAAI,CAAC;AAC/D,IAAM,kBAAkB,KAAK,QAC3B,YACA,MACA,MACA,UACA,gBACD;AACD,IAAM,oBAAoB;CACxB,QAAQ,KAAK,QAAQ,iBAAiB,aAAa;CACnD,QAAQ,KAAK,QAAQ,iBAAiB,YAAY;CAClD,OAAO,KAAK,QAAQ,iBAAiB,WAAW;CACjD;AAED,SAAgB,cACd,SACqB;AACrB,QAAO,CACL;EACE,MAAM;EACN,SAAS;AAQP,UAAO,EACL,SAAS,EACP,QAAQ;IAAC;IAAY;IAAgB;IAAmB,EACzD,EACF;;EAEH,kBAAkB,iBAAiB,SAAS;AAC1C,UAAO,EACL,cACE,oBAAoB,uBAAuB,UAC1C,oBAAoB,uBAAuB,UAE1C,QAAQ,cAAc,gBAAgB,QACpC,EAEE,SAAS;IACP;IACA;IACA;IACD,EACF,GACD,KAAA,GACP;;EAEJ,EACD,4BACE;EACE,WAAW;EACX;EACD,EACD,QACD,CACF"}
+{"version":3,"file":"vite.js","names":[],"sources":["../../../src/plugin/vite.ts"],"sourcesContent":["import {\n  START_ENVIRONMENT_NAMES,\n  tanStackStartVite,\n} from '@tanstack/start-plugin-core/vite'\nimport type {\n  TanStackStartViteInputConfig,\n  TanStackStartVitePluginCoreOptions,\n} from '@tanstack/start-plugin-core/vite'\nimport { solidStartDefaultEntryPaths } from './shared'\nimport type { PluginOption } from 'vite'\n\nexport function tanstackStart(\n  options?: TanStackStartViteInputConfig,\n): Array<PluginOption> {\n  const corePluginOpts: TanStackStartVitePluginCoreOptions = {\n    framework: 'solid',\n    defaultEntryPaths: solidStartDefaultEntryPaths,\n    providerEnvironmentName: START_ENVIRONMENT_NAMES.server,\n    ssrIsProvider: true,\n    ssrResolverStrategy: {\n      type: 'default',\n    },\n  }\n\n  return [\n    {\n      name: 'tanstack-solid-start:config',\n      config() {\n        // Ensure a single copy of Solid runtime packages is used across the\n        // app, the router, and the auto-injected default client/server entries.\n        // Without this, mixed pnpm resolutions (e.g. `@solidjs/web` beta.6\n        // linked into `@tanstack/solid-start`'s node_modules vs. beta.7 in the\n        // user's project) cause two parallel runtimes to be bundled. Two\n        // `_$HY.done` setters then race, causing `hydrate()` to early-return\n        // into non-hydrating render mode and breaking client interactivity.\n        return {\n          resolve: {\n            dedupe: ['solid-js', '@solidjs/web', '@solidjs/signals'],\n          },\n          ssr: {\n            noExternal: [\n              '@tanstack/solid-router-ssr-query',\n              '@tanstack/solid-query',\n              '@tanstack/solid-query-devtools',\n            ],\n          },\n        }\n      },\n      configEnvironment(environmentName, options) {\n        return {\n          optimizeDeps:\n            environmentName === START_ENVIRONMENT_NAMES.client ||\n            (environmentName === START_ENVIRONMENT_NAMES.server &&\n              // This indicates that the server environment has opted in to dependency optimization\n              options.optimizeDeps?.noDiscovery === false)\n              ? {\n                  // As `@tanstack/solid-start` depends on `@tanstack/solid-router`, we should exclude both.\n                  exclude: [\n                    '@tanstack/solid-start',\n                    '@tanstack/solid-router',\n                    '@tanstack/start-static-server-functions',\n                  ],\n                }\n              : undefined,\n        }\n      },\n    },\n    tanStackStartVite(corePluginOpts, options),\n  ]\n}\n"],"mappings":";;;AAWA,SAAgB,cACd,SACqB;CAWrB,OAAO,CACL;EACE,MAAM;EACN,SAAS;GAQP,OAAO;IACL,SAAS,EACP,QAAQ;KAAC;KAAY;KAAgB;IAAkB,EACzD;IACA,KAAK,EACH,YAAY;KACV;KACA;KACA;IACF,EACF;GACF;EACF;EACA,kBAAkB,iBAAiB,SAAS;GAC1C,OAAO,EACL,cACE,oBAAoB,wBAAwB,UAC3C,oBAAoB,wBAAwB,UAE3C,QAAQ,cAAc,gBAAgB,QACpC,EAEE,SAAS;IACP;IACA;IACA;GACF,EACF,IACA,KAAA,EACR;EACF;CACF,GACA,kBAAkB;EApDlB,WAAW;EACX,mBAAmB;EACnB,yBAAyB,wBAAwB;EACjD,eAAe;EACf,qBAAqB,EACnB,MAAM,UACR;CA8CkB,GAAgB,OAAO,CAC3C;AACF"}

package/dist/esm/useServerFn.js

@@ -9,7 +9,7 @@ function useServerFn(serverFn) {
 			return res;
 		} catch (err) {
 			if (isRedirect(err)) {
-				err.options._fromLocation = router.stores.location.state;
+				err.options._fromLocation = router.stores.location.get();
 				return router.navigate(router.resolveRedirect(err).options);
 			}
 			throw err;

package/dist/esm/useServerFn.js.map

@@ -1 +1 @@
-{"version":3,"file":"useServerFn.js","names":[],"sources":["../../src/useServerFn.ts"],"sourcesContent":["import { isRedirect, useRouter } from '@tanstack/solid-router'\n\nexport function useServerFn<T extends (...deps: Array<any>) => Promise<any>>(\n  serverFn: T,\n): (...args: Parameters<T>) => ReturnType<T> {\n  const router = useRouter()\n\n  return (async (...args: Array<any>) => {\n    try {\n      const res = await serverFn(...args)\n\n      if (isRedirect(res)) {\n        throw res\n      }\n\n      return res\n    } catch (err) {\n      if (isRedirect(err)) {\n        err.options._fromLocation = router.stores.location.state\n        return router.navigate(router.resolveRedirect(err).options)\n      }\n\n      throw err\n    }\n  }) as any\n}\n"],"mappings":";;AAEA,SAAgB,YACd,UAC2C;CAC3C,MAAM,SAAS,WAAW;AAE1B,SAAQ,OAAO,GAAG,SAAqB;AACrC,MAAI;GACF,MAAM,MAAM,MAAM,SAAS,GAAG,KAAK;AAEnC,OAAI,WAAW,IAAI,CACjB,OAAM;AAGR,UAAO;WACA,KAAK;AACZ,OAAI,WAAW,IAAI,EAAE;AACnB,QAAI,QAAQ,gBAAgB,OAAO,OAAO,SAAS;AACnD,WAAO,OAAO,SAAS,OAAO,gBAAgB,IAAI,CAAC,QAAQ;;AAG7D,SAAM"}
+{"version":3,"file":"useServerFn.js","names":[],"sources":["../../src/useServerFn.ts"],"sourcesContent":["import { isRedirect, useRouter } from '@tanstack/solid-router'\n\nexport function useServerFn<T extends (...deps: Array<any>) => Promise<any>>(\n  serverFn: T,\n): (...args: Parameters<T>) => ReturnType<T> {\n  const router = useRouter()\n\n  return (async (...args: Array<any>) => {\n    try {\n      const res = await serverFn(...args)\n\n      if (isRedirect(res)) {\n        throw res\n      }\n\n      return res\n    } catch (err) {\n      if (isRedirect(err)) {\n        err.options._fromLocation = router.stores.location.get()\n        return router.navigate(router.resolveRedirect(err).options)\n      }\n\n      throw err\n    }\n  }) as any\n}\n"],"mappings":";;AAEA,SAAgB,YACd,UAC2C;CAC3C,MAAM,SAAS,UAAU;CAEzB,QAAQ,OAAO,GAAG,SAAqB;EACrC,IAAI;GACF,MAAM,MAAM,MAAM,SAAS,GAAG,IAAI;GAElC,IAAI,WAAW,GAAG,GAChB,MAAM;GAGR,OAAO;EACT,SAAS,KAAK;GACZ,IAAI,WAAW,GAAG,GAAG;IACnB,IAAI,QAAQ,gBAAgB,OAAO,OAAO,SAAS,IAAI;IACvD,OAAO,OAAO,SAAS,OAAO,gBAAgB,GAAG,EAAE,OAAO;GAC5D;GAEA,MAAM;EACR;CACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-start",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -38,6 +38,12 @@
         "default": "./dist/esm/client.js"
       }
     },
+    "./hydration": {
+      "import": {
+        "types": "./dist/esm/hydration.d.ts",
+        "default": "./dist/esm/hydration.js"
+      }
+    },
     "./client-rpc": {
       "import": {
         "types": "./dist/esm/client-rpc.d.ts",
@@ -68,6 +74,12 @@
         "default": "./dist/esm/plugin/vite.js"
       }
     },
+    "./plugin/rsbuild": {
+      "import": {
+        "types": "./dist/esm/plugin/rsbuild.d.ts",
+        "default": "./dist/esm/plugin/rsbuild.js"
+      }
+    },
     "./server-entry": {
       "import": {
         "types": "./dist/default-entry/esm/server.d.ts",
@@ -101,28 +113,34 @@
   },
   "dependencies": {
     "pathe": "^2.0.3",
-    "@tanstack/solid-start-client": "2.0.0-beta.19",
-    "@tanstack/solid-router": "2.0.0-beta.19",
-    "@tanstack/solid-start-server": "2.0.0-beta.19",
-    "@tanstack/start-client-core": "1.167.9",
-    "@tanstack/start-plugin-core": "1.167.17",
-    "@tanstack/start-server-core": "1.167.9"
+    "@tanstack/solid-router": "2.0.0-beta.20",
+    "@tanstack/solid-start-client": "2.0.0-beta.20",
+    "@tanstack/solid-start-server": "2.0.0-beta.20",
+    "@tanstack/start-client-core": "1.170.6",
+    "@tanstack/start-plugin-core": "1.171.10",
+    "@tanstack/start-server-core": "1.169.8"
   },
   "devDependencies": {
+    "@rsbuild/core": "^2.0.8",
     "@solidjs/web": "2.0.0-beta.14",
-    "@tanstack/intent": "^0.0.14",
     "@types/node": ">=20",
     "solid-js": "2.0.0-beta.14",
     "vite": "*",
-    "@tanstack/router-utils": "1.161.6"
+    "@tanstack/router-utils": "1.162.1"
   },
   "peerDependencies": {
     "@solidjs/web": ">=2.0.0-0 <3.0.0",
     "solid-js": ">=2.0.0-0 <3.0.0",
-    "vite": ">=7.0.0"
+    "vite": ">=7.0.0",
+    "@rsbuild/core": "^2.0.0"
   },
-  "bin": {
-    "intent": "./bin/intent.js"
+  "peerDependenciesMeta": {
+    "@rsbuild/core": {
+      "optional": true
+    },
+    "vite": {
+      "optional": true
+    }
   },
   "scripts": {
     "clean": "rimraf ./dist && rimraf ./coverage",

package/src/hydration.ts

@@ -0,0 +1,18 @@
+export {
+  condition,
+  idle,
+  interaction,
+  load,
+  media,
+  never,
+  visible,
+} from '@tanstack/solid-start-client/hydration'
+export type {
+  HydrationCondition,
+  HydrationInteractionEvent,
+  HydrationInteractionEvents,
+  HydrationPrefetchStrategy,
+  HydrationStrategy,
+  HydrationWhen,
+  VisibleHydrationOptions,
+} from '@tanstack/solid-start-client/hydration'

package/src/index.ts

@@ -1,2 +1,34 @@
 export { useServerFn } from './useServerFn'
 export * from '@tanstack/start-client-core'
+// Explicit re-exports shadow `export *` above so these public-API names are
+// registered on the namespace at link time (via Vite SSR's `defineExport`
+// at fileStartIndex), surviving the cold-start SSR cycle through user
+// middleware. See vitejs/vite#22491 / #22493. Trim list to genuine public
+// API only; internals fall through `export *` and are safe because they
+// aren't imported at top level in the cycle path.
+export {
+  createClientOnlyFn,
+  createCsrfMiddleware,
+  createIsomorphicFn,
+  createMiddleware,
+  createServerFn,
+  createServerOnlyFn,
+  createStart,
+} from '@tanstack/start-client-core'
+
+// Keep root `@tanstack/solid-start` imports from evaluating the client barrel.
+// The barrel also exports `hydrateStart`, which imports the virtual client
+// entry. That virtual entry imports the user's router module, so route modules
+// that import the root package can be pulled back into the same graph and
+// create circular HMR updates. Re-exporting from the Hydrate-only subpath
+// preserves the public API without introducing that import edge.
+export { Hydrate } from '@tanstack/solid-start-client/Hydrate'
+export type {
+  HydrateOptions,
+  HydrateProps,
+  HydrationInteractionEvent,
+  HydrationInteractionEvents,
+  HydrationPrefetchStrategy,
+  HydrationStrategy,
+  HydrationWhen,
+} from '@tanstack/solid-start-client/Hydrate'

package/src/plugin/rsbuild.ts

@@ -0,0 +1,81 @@
+import {
+  RSBUILD_ENVIRONMENT_NAMES,
+  tanStackStartRsbuild,
+} from '@tanstack/start-plugin-core/rsbuild'
+import { solidStartDefaultEntryPaths } from './shared'
+import type {
+  TanStackStartRsbuildInputConfig,
+  TanStackStartRsbuildPluginCoreOptions,
+} from '@tanstack/start-plugin-core/rsbuild'
+import type { RsbuildPlugin } from '@rsbuild/core'
+
+export function tanstackStart(
+  options?: TanStackStartRsbuildInputConfig,
+): RsbuildPlugin {
+  const corePluginOpts: TanStackStartRsbuildPluginCoreOptions = {
+    framework: 'solid',
+    defaultEntryPaths: solidStartDefaultEntryPaths,
+    providerEnvironmentName: RSBUILD_ENVIRONMENT_NAMES.server,
+    ssrIsProvider: true,
+    rsbuild: {
+      environments: {
+        all: {
+          resolve: {
+            conditionNames: ['solid', '...'],
+          },
+        },
+      },
+    },
+  }
+
+  const basePlugin = tanStackStartRsbuild(corePluginOpts, options)
+
+  return {
+    name: 'tanstack-solid-start-rsbuild',
+    setup(api) {
+      basePlugin.setup(api)
+
+      api.modifyBundlerChain(async (chain, { CHAIN_ID, target }) => {
+        for (const ruleId of [
+          CHAIN_ID.RULE.JS,
+          CHAIN_ID.RULE.JS_DATA_URI,
+          'babel-js',
+        ]) {
+          if (!chain.module.rules.has(ruleId)) {
+            continue
+          }
+
+          const rule = chain.module.rule(ruleId)
+          if (!rule.uses.has(CHAIN_ID.USE.BABEL)) {
+            continue
+          }
+
+          rule.use(CHAIN_ID.USE.BABEL).tap((babelOptions) => {
+            babelOptions.presets = (babelOptions.presets ?? []).map(
+              (preset: unknown) => {
+                if (
+                  Array.isArray(preset) &&
+                  typeof preset[0] === 'string' &&
+                  preset[0].includes('babel-preset-solid')
+                ) {
+                  return [
+                    preset[0],
+                    {
+                      ...(preset[1] ?? {}),
+                      hydratable: true,
+                      generate: target === 'node' ? 'ssr' : 'dom',
+                    },
+                  ]
+                }
+
+                return preset
+              },
+            )
+
+            return babelOptions
+          })
+        }
+      })
+    },
+  }
+}

package/src/plugin/shared.ts

@@ -0,0 +1,17 @@
+import { fileURLToPath } from 'node:url'
+import path from 'pathe'
+
+const currentDir = path.dirname(fileURLToPath(import.meta.url))
+const defaultEntryDir = path.resolve(
+  currentDir,
+  '..',
+  '..',
+  'plugin',
+  'default-entry',
+)
+
+export const solidStartDefaultEntryPaths = {
+  client: path.resolve(defaultEntryDir, 'client.tsx'),
+  server: path.resolve(defaultEntryDir, 'server.ts'),
+  start: path.resolve(defaultEntryDir, 'start.ts'),
+}

package/src/plugin/vite.ts

@@ -1,29 +1,27 @@
-import { fileURLToPath } from 'node:url'
 import {
-  TanStackStartVitePluginCore,
-  VITE_ENVIRONMENT_NAMES,
-} from '@tanstack/start-plugin-core'
-import path from 'pathe'
-import type { TanStackStartInputConfig } from '@tanstack/start-plugin-core'
+  START_ENVIRONMENT_NAMES,
+  tanStackStartVite,
+} from '@tanstack/start-plugin-core/vite'
+import type {
+  TanStackStartViteInputConfig,
+  TanStackStartVitePluginCoreOptions,
+} from '@tanstack/start-plugin-core/vite'
+import { solidStartDefaultEntryPaths } from './shared'
 import type { PluginOption } from 'vite'
 
-const currentDir = path.dirname(fileURLToPath(import.meta.url))
-const defaultEntryDir = path.resolve(
-  currentDir,
-  '..',
-  '..',
-  'plugin',
-  'default-entry',
-)
-const defaultEntryPaths = {
-  client: path.resolve(defaultEntryDir, 'client.tsx'),
-  server: path.resolve(defaultEntryDir, 'server.ts'),
-  start: path.resolve(defaultEntryDir, 'start.ts'),
-}
-
 export function tanstackStart(
-  options?: TanStackStartInputConfig,
+  options?: TanStackStartViteInputConfig,
 ): Array<PluginOption> {
+  const corePluginOpts: TanStackStartVitePluginCoreOptions = {
+    framework: 'solid',
+    defaultEntryPaths: solidStartDefaultEntryPaths,
+    providerEnvironmentName: START_ENVIRONMENT_NAMES.server,
+    ssrIsProvider: true,
+    ssrResolverStrategy: {
+      type: 'default',
+    },
+  }
+
   return [
     {
       name: 'tanstack-solid-start:config',
@@ -39,13 +37,20 @@ export function tanstackStart(
           resolve: {
             dedupe: ['solid-js', '@solidjs/web', '@solidjs/signals'],
           },
+          ssr: {
+            noExternal: [
+              '@tanstack/solid-router-ssr-query',
+              '@tanstack/solid-query',
+              '@tanstack/solid-query-devtools',
+            ],
+          },
         }
       },
       configEnvironment(environmentName, options) {
         return {
           optimizeDeps:
-            environmentName === VITE_ENVIRONMENT_NAMES.client ||
-            (environmentName === VITE_ENVIRONMENT_NAMES.server &&
+            environmentName === START_ENVIRONMENT_NAMES.client ||
+            (environmentName === START_ENVIRONMENT_NAMES.server &&
               // This indicates that the server environment has opted in to dependency optimization
               options.optimizeDeps?.noDiscovery === false)
               ? {
@@ -60,12 +65,6 @@ export function tanstackStart(
         }
       },
     },
-    TanStackStartVitePluginCore(
-      {
-        framework: 'solid',
-        defaultEntryPaths,
-      },
-      options,
-    ),
+    tanStackStartVite(corePluginOpts, options),
   ]
 }

package/src/useServerFn.ts

@@ -16,7 +16,7 @@ export function useServerFn<T extends (...deps: Array<any>) => Promise<any>>(
       return res
     } catch (err) {
       if (isRedirect(err)) {
-        err.options._fromLocation = router.stores.location.state
+        err.options._fromLocation = router.stores.location.get()
         return router.navigate(router.resolveRedirect(err).options)
       }
 

package/bin/intent.js

@@ -1,25 +0,0 @@
-#!/usr/bin/env node
-// Auto-generated by @tanstack/intent setup
-// Exposes the intent end-user CLI for consumers of this library.
-// Commit this file, then add to your package.json:
-//   "bin": { "intent": "./bin/intent.js" }
-try {
-  await import('@tanstack/intent/intent-library')
-} catch (e) {
-  const isModuleNotFound =
-    e?.code === 'ERR_MODULE_NOT_FOUND' || e?.code === 'MODULE_NOT_FOUND'
-  const missingIntentLibrary =
-    typeof e?.message === 'string' && e.message.includes('@tanstack/intent')
-
-  if (isModuleNotFound && missingIntentLibrary) {
-    console.error('@tanstack/intent is not installed.')
-    console.error('')
-    console.error('Install it as a dev dependency:')
-    console.error('  npm add -D @tanstack/intent')
-    console.error('')
-    console.error('Or run directly:')
-    console.error('  npx @tanstack/intent@latest list')
-    process.exit(1)
-  }
-  throw e
-}