move telemetry option

Author: chargome

packages/react-router/src/vite/makeCustomSentryVitePlugins.ts

@@ -6,23 +6,16 @@ import type { SentryReactRouterBuildOptions } from './types';
  * Create a custom subset of sentry's vite plugins
  */
 export async function makeCustomSentryVitePlugins(options: SentryReactRouterBuildOptions): Promise<Plugin[]> {
-  const {
-    debug,
-    sourceMapsUploadOptions,
-    unstable_sentryVitePluginOptions,
-    bundleSizeOptimizations,
-    authToken,
-    org,
-    project,
-  } = options;
+  const { debug, unstable_sentryVitePluginOptions, bundleSizeOptimizations, authToken, org, project, telemetry } =
+    options;
 
   const sentryVitePlugins = sentryVitePlugin({
     authToken: authToken ?? process.env.SENTRY_AUTH_TOKEN,
     bundleSizeOptimizations,
     debug: debug ?? false,
     org: org ?? process.env.SENTRY_ORG,
     project: project ?? process.env.SENTRY_PROJECT,
-    telemetry: sourceMapsUploadOptions?.telemetry ?? true,
+    telemetry: telemetry ?? true,
     _metaOptions: {
       telemetry: {
         metaFramework: 'react-router',

packages/react-router/src/vite/types.ts

@@ -9,14 +9,6 @@ type SourceMapsOptions = {
    */
   enabled?: boolean;
 
-  /**
-   * If this flag is `true`, the Sentry plugin will collect some telemetry data and send it to Sentry.
-   * It will not collect any sensitive or user-specific data.
-   *
-   * @default true
-   */
-  telemetry?: boolean;
-
   /**
    * A glob or an array of globs that specifies the build artifacts that should be deleted after the artifact
    * upload to Sentry has been completed.
@@ -139,6 +131,14 @@ export type SentryReactRouterBuildOptions = {
    */
   sourceMapsUploadOptions?: SourceMapsOptions;
 
+  /**
+   * If this flag is `true`, the Sentry plugin will collect some telemetry data and send it to Sentry.
+   * It will not collect any sensitive or user-specific data.
+   *
+   * @default true
+   */
+  telemetry?: boolean;
+
   /**
    * Options to further customize the Sentry Vite Plugin (@sentry/vite-plugin) behavior directly.
    * Options specified in this object take precedence over the options specified in