fix(tanstackstart-react): Add workerd and worker export conditions

Add `workerd` and `worker` export conditions to the `.` entry in
package.json, pointing to `index.server.js`. This prevents the
Cloudflare Vite plugin's resolve conditions (`workerd`, `worker`,
`module`, `browser`) from falling through to the `browser` condition,
which would resolve to `index.client.js` and trigger TanStack Start's
import-protection plugin rejecting `*.client.*` files in the server
environment.

Users deploying to Cloudflare Workers will need `nodejs_compat` enabled
in their wrangler configuration.

A dedicated Cloudflare entrypoint (without `@sentry/node` dependency)
will be addressed in a follow-up PR.

Author: smorimoto

packages/tanstackstart-react/package.json

@@ -20,12 +20,12 @@
     ".": {
       "types": "./build/types/index.types.d.ts",
       "workerd": {
-        "import": "./build/esm/cloudflare/index.js",
-        "require": "./build/cjs/cloudflare/index.js"
+        "import": "./build/esm/index.server.js",
+        "require": "./build/cjs/index.server.js"
       },
       "worker": {
-        "import": "./build/esm/cloudflare/index.js",
-        "require": "./build/cjs/cloudflare/index.js"
+        "import": "./build/esm/index.server.js",
+        "require": "./build/cjs/index.server.js"
       },
       "browser": {
         "import": "./build/esm/index.client.js",
@@ -36,12 +36,6 @@
         "require": "./build/cjs/index.server.js"
       }
     },
-    "./cloudflare": {
-      "types": "./build/types/cloudflare/index.d.ts",
-      "import": "./build/esm/cloudflare/index.js",
-      "require": "./build/cjs/cloudflare/index.js",
-      "default": "./build/esm/cloudflare/index.js"
-    },
     "./import": {
       "import": {
         "default": "./build/import-hook.mjs"
@@ -51,11 +45,6 @@
       "import": {
         "default": "./build/loader-hook.mjs"
       }
-    },
-    "./vite": {
-      "types": "./build/types/vite/index.d.ts",
-      "import": "./build/esm/vite/index.js",
-      "require": "./build/cjs/vite/index.js"
     }
   },
   "typesVersions": {
@@ -75,7 +64,7 @@
     "@sentry/core": "10.39.0",
     "@sentry/node": "10.39.0",
     "@sentry/react": "10.39.0",
-    "@sentry/vite-plugin": "^5.1.0"
+    "@sentry/vite-plugin": "^4.8.0"
   },
   "devDependencies": {
     "vite": "^5.4.11"
@@ -91,7 +80,7 @@
     "build:dev:watch": "yarn build:watch",
     "build:transpile:watch": "nodemon --ext ts --watch src scripts/buildRollup.ts",
     "build:tarball": "npm pack",
-    "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts && madge --circular src/cloudflare/index.ts",
+    "circularDepCheck": "madge --circular src/index.client.ts && madge --circular src/index.server.ts && madge --circular src/index.types.ts",
     "clean": "rimraf build coverage sentry-tanstackstart-react-*.tgz",
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",

packages/tanstackstart-react/rollup.npm.config.mjs

@@ -3,14 +3,7 @@ import { makeBaseNPMConfig, makeNPMConfigVariants, makeOtelLoaders } from '@sent
 export default [
   ...makeNPMConfigVariants(
     makeBaseNPMConfig({
-      entrypoints: [
-        'src/index.server.ts',
-        'src/index.client.ts',
-        'src/client/index.ts',
-        'src/server/index.ts',
-        'src/vite/index.ts',
-        'src/cloudflare/index.ts',
-      ],
+      entrypoints: ['src/index.server.ts', 'src/index.client.ts', 'src/client/index.ts', 'src/server/index.ts'],
     }),
   ),
   ...makeOtelLoaders('./build', 'sentry-node'),

packages/tanstackstart-react/src/cloudflare/index.ts

@@ -3,3 +3,4 @@
 export * from './config';
 export * from './server';
 export * from './common';
+export * from './vite';

packages/tanstackstart-react/src/index.server.ts

@@ -12,6 +12,7 @@ export * from './config';
 export * from './client';
 export * from './server';
 export * from './common';
+export * from './vite';
 
 /** Initializes Sentry TanStack Start SDK */
 export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): Client | undefined;
@@ -22,6 +23,9 @@ export declare const contextLinesIntegration: typeof clientSdk.contextLinesInteg
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
 
+export declare const ErrorBoundary: typeof clientSdk.ErrorBoundary;
+export declare const withErrorBoundary: typeof clientSdk.withErrorBoundary;
+
 export declare const logger: typeof clientSdk.logger | typeof serverSdk.logger;
 
 export declare const growthbookIntegration: typeof clientSdk.growthbookIntegration;
@@ -34,6 +38,5 @@ export declare const unleashIntegration: typeof clientSdk.unleashIntegration;
 
 export declare const wrapMiddlewaresWithSentry: typeof serverSdk.wrapMiddlewaresWithSentry;
 
-export declare const tanstackRouterBrowserTracingIntegration: typeof clientSdk.tanstackRouterBrowserTracingIntegration;
 export declare const sentryGlobalRequestMiddleware: typeof serverSdk.sentryGlobalRequestMiddleware;
 export declare const sentryGlobalFunctionMiddleware: typeof serverSdk.sentryGlobalFunctionMiddleware;

packages/tanstackstart-react/src/index.types.ts

@@ -1,8 +1,6 @@
 // import/export got a false positive, and affects most of our index barrel files
 // can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
-import type { Integration } from '@sentry/core';
-
 export * from '@sentry/node';
 
 export { init } from './sdk';
@@ -11,15 +9,28 @@ export { wrapMiddlewaresWithSentry } from './middleware';
 export { sentryGlobalRequestMiddleware, sentryGlobalFunctionMiddleware } from './globalMiddleware';
 
 /**
- * A no-op stub of the browser tracing integration for the server. Router setup code is shared between client and server,
- * so this stub is needed to prevent build errors during SSR bundling.
+ * A passthrough error boundary for the server that doesn't depend on any react. Error boundaries don't catch SSR errors
+ * so they should simply be a passthrough.
+ */
+export const ErrorBoundary = (props: React.PropsWithChildren<unknown>): React.ReactNode => {
+  if (!props.children) {
+    return null;
+  }
+
+  if (typeof props.children === 'function') {
+    return (props.children as () => React.ReactNode)();
+  }
+
+  return props.children;
+};
+
+/**
+ * A passthrough error boundary wrapper for the server that doesn't depend on any react. Error boundaries don't catch
+ * SSR errors so they should simply be a passthrough.
  */
-export function tanstackRouterBrowserTracingIntegration(
-  _router: unknown,
-  _options?: Record<string, unknown>,
-): Integration {
-  return {
-    name: 'BrowserTracing',
-    setup() {},
-  };
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function withErrorBoundary<P extends Record<string, any>>(
+  WrappedComponent: React.ComponentType<P>,
+): React.FC<P> {
+  return WrappedComponent as React.FC<P>;
 }

packages/tanstackstart-react/src/server/index.ts

@@ -1,5 +1,6 @@
-import type { Span } from '@sentry/core';
-import { addNonEnumerableProperty, getActiveSpan, startSpanManual, withActiveSpan } from '@sentry/core';
+import { addNonEnumerableProperty } from '@sentry/core';
+import type { Span } from '@sentry/node';
+import { getActiveSpan, startSpanManual, withActiveSpan } from '@sentry/node';
 import type { MiddlewareWrapperOptions, TanStackMiddlewareBase } from '../common/types';
 import { getMiddlewareSpanOptions } from './utils';
 

packages/tanstackstart-react/src/server/middleware.ts

@@ -1,5 +1,5 @@
 import type { StartSpanOptions } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/node';
 
 /**
  * Extracts the SHA-256 hash from a server function pathname.

packages/tanstackstart-react/src/server/utils.ts

@@ -1,4 +1,4 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/node';
 import { extractServerFunctionSha256 } from './utils';
 
 export type ServerEntry = {

packages/tanstackstart-react/src/server/wrapFetchWithSentry.ts

@@ -28,7 +28,7 @@ export interface SentryTanstackStartOptions extends BuildTimeOptionsBase {
  * ```typescript
  * // vite.config.ts
  * import { defineConfig } from 'vite';
- * import { sentryTanstackStart } from '@sentry/tanstackstart-react/vite';
+ * import { sentryTanstackStart } from '@sentry/tanstackstart-react';
  * import { tanstackStart } from '@tanstack/react-start/plugin/vite';
  *
  * export default defineConfig({