@sentry/wizard 3.14.0 → 3.15.0

package/src/remix/sdk-setup.ts

@@ -164,6 +164,7 @@ export async function updateBuildScript(args: {
   org: string;
   project: string;
   url?: string;
+  isHydrogen: boolean;
 }): Promise<void> {
   /* eslint-disable @typescript-eslint/no-unsafe-member-access */
   // Add sourcemaps option to build script
@@ -177,17 +178,24 @@ export async function updateBuildScript(args: {
     packageJson.scripts = {};
   }
 
+  const buildCommand = args.isHydrogen
+    ? 'shopify hydrogen build'
+    : 'remix build';
+
+  const instrumentedBuildCommand =
+    `${buildCommand} --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +
+    (args.url ? ` --url ${args.url}` : '') +
+    (args.isHydrogen ? ' --buildPath ./dist' : '');
+
   if (!packageJson.scripts.build) {
-    packageJson.scripts.build =
-      `remix build --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +
-      (args.url ? ` --url ${args.url}` : '');
+    packageJson.scripts.build = instrumentedBuildCommand;
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  } else if (packageJson.scripts.build.includes('remix build')) {
+  } else if (packageJson.scripts.build.includes(buildCommand)) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     packageJson.scripts.build = packageJson.scripts.build.replace(
-      'remix build',
-      'remix build --sourcemap && sentry-upload-sourcemaps',
+      buildCommand,
+      instrumentedBuildCommand,
     );
   }
 

package/src/remix/templates.ts

@@ -5,11 +5,7 @@ export const ERROR_BOUNDARY_TEMPLATE_V2 = `const ErrorBoundary = () => {
 };
 `;
 
-export const HANDLE_ERROR_TEMPLATE_V2 = `function handleError(error) {
-  if (error instanceof Error) {
-    Sentry.captureRemixErrorBoundaryError(error);
-  } else {
-    Sentry.captureException(error);
-  }
+export const HANDLE_ERROR_TEMPLATE_V2 = `function handleError(error, { request }) {
+  Sentry.captureRemixServerException(error, 'remix.server', request);
 }
 `;

package/src/remix/utils.ts

@@ -5,6 +5,7 @@ import * as path from 'path';
 // @ts-expect-error - clack is ESM and TS complains about that. It works though
 import clack from '@clack/prompts';
 import chalk from 'chalk';
+import { PackageDotJson, hasPackageInstalled } from '../utils/package-json';
 
 // Copied from sveltekit wizard
 export function hasSentryContent(
@@ -39,3 +40,7 @@ export function getInitCallInsertionIndex(
 
   return 0;
 }
+
+export function isHydrogenApp(packageJson: PackageDotJson): boolean {
+  return hasPackageInstalled('@shopify/hydrogen', packageJson);
+}

package/src/sveltekit/sdk-setup.ts

@@ -440,14 +440,14 @@ async function modifyViteConfig(
 
   const { org, project, url, selfHosted } = projectInfo;
 
+  const prettyViteConfigFilename = chalk.cyan(path.basename(viteConfigPath));
+
   try {
     const viteModule = parseModule(viteConfigContent);
 
     if (hasSentryContent(viteModule.$ast as t.Program)) {
       clack.log.warn(
-        `File ${chalk.cyan(
-          path.basename(viteConfigPath),
-        )} already contains Sentry code.
+        `File ${prettyViteConfigFilename} already contains Sentry code.
 Skipping adding Sentry functionality to.`,
       );
       Sentry.setTag(`modified-vite-cfg`, 'fail');
@@ -490,6 +490,9 @@ Skipping adding Sentry functionality to.`,
     );
     Sentry.captureException('Sveltekit Vite Config Modification Fail');
   }
+
+  clack.log.success(`Added Sentry code to ${prettyViteConfigFilename}`);
+  Sentry.setTag(`modified-vite-cfg`, 'success');
 }
 
 async function showFallbackViteCopyPasteSnippet(