feat(remix): Pass org, project, url to upload-sourcemaps script.

getsentry · Sep 8, 2023 · 68362aa · 68362aa
1 parent 523b7fa
commit 68362aa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/src/remix/remix-wizard.ts b/src/remix/remix-wizard.ts
@@ -53,10 +53,8 @@ async function runRemixWizardWithTelemetry(
   // We expect `@remix-run/dev` to be installed for every Remix project
   await ensurePackageIsInstalled(packageJson, '@remix-run/dev', 'Remix');
 
-  const { selectedProject, authToken } = await getOrAskForProjectData(
-    options,
-    'javascript-remix',
-  );
+  const { selectedProject, authToken, sentryUrl } =
+    await getOrAskForProjectData(options, 'javascript-remix');
 
   await traceStep('Install Sentry SDK', () =>
     installPackage({
@@ -70,16 +68,15 @@ async function runRemixWizardWithTelemetry(
   const isTS = isUsingTypeScript();
   const isV2 = isRemixV2(remixConfig, packageJson);
 
-  await addSentryCliConfig(
-    authToken,
-    sourceMapsCliSetupConfig,
-    selectedProject.organization.slug,
-    selectedProject.name,
-  );
+  await addSentryCliConfig(authToken, sourceMapsCliSetupConfig);
 
   await traceStep('Update build script for sourcemap uploads', async () => {
     try {
-      await updateBuildScript();
+      await updateBuildScript({
+        org: selectedProject.organization.slug,
+        project: selectedProject.name,
+        url: sentryUrl,
+      });
     } catch (e) {
       clack.log
         .warn(`Could not update build script to generate and upload sourcemaps.

diff --git a/src/remix/sdk-setup.ts b/src/remix/sdk-setup.ts
@@ -151,7 +151,11 @@ export async function instrumentRootRoute(
   /* eslint-enable @typescript-eslint/no-unsafe-member-access */
 }
 
-export async function updateBuildScript(): Promise<void> {
+export async function updateBuildScript(args: {
+  org: string;
+  project: string;
+  url?: string;
+}): Promise<void> {
   /* eslint-disable @typescript-eslint/no-unsafe-member-access */
   // Add sourcemaps option to build script
   const packageJsonPath = path.join(process.cwd(), 'package.json');
@@ -166,7 +170,9 @@ export async function updateBuildScript(): Promise<void> {
 
   if (!packageJson.scripts.build) {
     packageJson.scripts.build =
-      'remix build --sourcemap && sentry-upload-sourcemaps';
+      `remix build --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +
+      (args.url ? ` --url ${args.url}` : '');
+
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
   } else if (packageJson.scripts.build.includes('remix build')) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call

diff --git a/src/utils/clack-utils.ts b/src/utils/clack-utils.ts
@@ -282,8 +282,6 @@ async function addOrgAndProjectToSentryCliRc(
 export async function addSentryCliConfig(
   authToken: string,
   setupConfig: CliSetupConfig = sourceMapsCliSetupConfig,
-  orgSlug?: string,
-  projectSlug?: string,
 ): Promise<void> {
   const configExists = fs.existsSync(
     path.join(process.cwd(), setupConfig.filename),
@@ -351,10 +349,6 @@ export async function addSentryCliConfig(
     }
   }
 
-  if (orgSlug && projectSlug) {
-    await addOrgAndProjectToSentryCliRc(orgSlug, projectSlug, setupConfig);
-  }
-
   await addAuthTokenFileToGitIgnore(setupConfig.filename);
 }