@sentry/wizard 3.10.0 → 3.11.0

package/src/apple/xcode-manager.ts

@@ -2,17 +2,30 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unused-vars */
+// @ts-ignore - clack is ESM and TS complains about that. It works though
+import clack from '@clack/prompts';
 import * as fs from 'fs';
 import { SentryProjectData } from '../utils/types';
 import * as templates from './templates';
+import * as path from 'path';
 const xcode = require('xcode');
 
-/* eslint-enable @typescript-eslint/no-unused-vars */
+interface ProjetFile {
+  key: string;
+  path: string;
+}
 
-function setDebugInformationFormat(proj: any): void {
+function setDebugInformationFormat(proj: any, targetName: string): void {
   const xcObjects = proj.hash.project.objects;
-  const target = proj.getFirstTarget().firstTarget;
+  const targetKey: string = Object.keys(xcObjects.PBXNativeTarget || {}).filter(
+    (key) => {
+      return (
+        !key.endsWith('_comment') &&
+        xcObjects.PBXNativeTarget[key].name === targetName
+      );
+    },
+  )[0];
+  const target = xcObjects.PBXNativeTarget[targetKey];
 
   xcObjects.XCConfigurationList[
     target.buildConfigurationList
@@ -23,7 +36,7 @@ function setDebugInformationFormat(proj: any): void {
   });
 }
 
-function addSentrySPM(proj: any): void {
+function addSentrySPM(proj: any, targetName: string): void {
   const xcObjects = proj.hash.project.objects;
 
   const sentryFrameworkUUID = proj.generateUuid() as string;
@@ -61,7 +74,16 @@ function addSentrySPM(proj: any): void {
     }
   }
 
-  const target = proj.getFirstTarget().firstTarget;
+  const targetKey: string = Object.keys(xcObjects.PBXNativeTarget || {}).filter(
+    (key) => {
+      return (
+        !key.endsWith('_comment') &&
+        xcObjects.PBXNativeTarget[key].name === targetName
+      );
+    },
+  )[0];
+  const target = xcObjects.PBXNativeTarget[targetKey];
+
   if (!target.packageProductDependencies) {
     target.packageProductDependencies = [];
   }
@@ -106,15 +128,25 @@ function addSentrySPM(proj: any): void {
   };
   xcObjects.XCSwiftPackageProductDependency[sentrySPMUUID + '_comment'] =
     'Sentry';
+
+  clack.log.step('Added Sentry SPM dependency to your project');
 }
 
 function addUploadSymbolsScript(
   xcodeProject: any,
   sentryProject: SentryProjectData,
-  apiKeys: { token: string },
+  targetName: string,
   uploadSource = true,
 ): void {
   const xcObjects = xcodeProject.hash.project.objects;
+  const targetKey: string = Object.keys(xcObjects.PBXNativeTarget || {}).filter(
+    (key) => {
+      return (
+        !key.endsWith('_comment') &&
+        xcObjects.PBXNativeTarget[key].name === targetName
+      );
+    },
+  )[0];
 
   for (const scriptKey in xcObjects.PBXShellScriptBuildPhase || {}) {
     if (!scriptKey.endsWith('_comment')) {
@@ -132,7 +164,7 @@ function addUploadSymbolsScript(
     [],
     'PBXShellScriptBuildPhase',
     'Upload Debug Symbols to Sentry',
-    null,
+    targetKey,
     {
       inputFileListPaths: [],
       outputFileListPaths: [],
@@ -141,29 +173,139 @@ function addUploadSymbolsScript(
       shellScript: templates.getRunScriptTemplate(
         sentryProject.organization.slug,
         sentryProject.slug,
-        apiKeys.token,
         uploadSource,
       ),
     },
   );
+  clack.log.step(`Added Sentry upload script to "${targetName}" build phase`);
 }
 
-export function updateXcodeProject(
-  projectPath: string,
-  sentryProject: SentryProjectData,
-  apiKeys: { token: string },
-  addSPMReference: boolean,
-  uploadSource = true,
-): void {
-  const proj = xcode.project(projectPath);
-  proj.parseSync();
-  addUploadSymbolsScript(proj, sentryProject, apiKeys, uploadSource);
-  if (uploadSource) {
-    setDebugInformationFormat(proj);
+export class XcodeProject {
+  projectPath: string;
+  project: any;
+  objects: any;
+  files: ProjetFile[] | undefined;
+
+  public constructor(projectPath: string) {
+    this.projectPath = projectPath;
+    this.project = xcode.project(projectPath);
+    this.project.parseSync();
+    this.objects = this.project.hash.project.objects;
+  }
+
+  public getAllTargets(): string[] {
+    return Object.keys(this.objects.PBXNativeTarget || {})
+      .filter((key) => {
+        return (
+          !key.endsWith('_comment') &&
+          this.objects.PBXNativeTarget[key].productType.startsWith(
+            '"com.apple.product-type.application',
+          )
+        );
+      })
+      .map((key) => {
+        return this.objects.PBXNativeTarget[key].name as string;
+      });
+  }
+
+  public updateXcodeProject(
+    sentryProject: SentryProjectData,
+    target: string,
+    apiKeys: { token: string },
+    addSPMReference: boolean,
+    uploadSource = true,
+  ): void {
+    addUploadSymbolsScript(this.project, sentryProject, target, uploadSource);
+    if (uploadSource) {
+      setDebugInformationFormat(this.project, target);
+    }
+    if (addSPMReference) {
+      addSentrySPM(this.project, target);
+    }
+    const newContent = this.project.writeSync();
+    fs.writeFileSync(this.projectPath, newContent);
+  }
+
+  public filesForTarget(target: string): string[] | undefined {
+    const files = this.projectFiles();
+    const fileDictionary: any = {};
+    files.forEach((file) => {
+      fileDictionary[file.key] = file.path;
+    });
+
+    const nativeTarget = Object.keys(this.objects.PBXNativeTarget || {}).filter(
+      (key) => {
+        return (
+          !key.endsWith('_comment') &&
+          this.objects.PBXNativeTarget[key].name === target
+        );
+      },
+    )[0];
+
+    if (nativeTarget === undefined) {
+      return undefined;
+    }
+
+    const buildPhaseKey = this.objects.PBXNativeTarget[
+      nativeTarget
+    ].buildPhases.filter((phase: any) => {
+      return this.objects.PBXSourcesBuildPhase[phase.value] !== undefined;
+    })[0];
+
+    if (buildPhaseKey === undefined) {
+      return undefined;
+    }
+
+    const buildPhases = this.objects.PBXSourcesBuildPhase[buildPhaseKey.value];
+    if (buildPhases === undefined) {
+      return undefined;
+    }
+
+    const baseDir = path.dirname(path.dirname(this.projectPath));
+
+    return buildPhases.files
+      .map((file: any) => {
+        const buildFile = fileDictionary[
+          this.objects.PBXBuildFile[file.value].fileRef
+        ] as string;
+        if (!buildFile) {
+          return '';
+        }
+        return path.join(baseDir, buildFile);
+      })
+      .filter((f: string) => f.length > 0) as string[];
   }
-  if (addSPMReference) {
-    addSentrySPM(proj);
+
+  projectFiles(): ProjetFile[] {
+    if (this.files === undefined) {
+      const proj = this.project.getFirstProject();
+      const mainGroupKey = proj.firstProject.mainGroup;
+      const mainGroup = this.objects.PBXGroup[mainGroupKey];
+      this.files = this.buildGroup(mainGroup);
+    }
+    return this.files;
+  }
+
+  buildGroup(group: any, path = ''): ProjetFile[] {
+    const result: ProjetFile[] = [];
+    for (const child of group.children) {
+      if (this.objects.PBXFileReference[child.value]) {
+        const fileReference = this.objects.PBXFileReference[child.value];
+        result.push({
+          key: child.value,
+          path: `${path}${fileReference.path.replace(/"/g, '')}`,
+        });
+      } else if (this.objects.PBXGroup[child.value]) {
+        const groupReference = this.objects.PBXGroup[child.value];
+        const groupChildren = this.buildGroup(
+          groupReference,
+          groupReference.path
+            ? `${path}${groupReference.path.replace(/"/g, '')}/`
+            : path,
+        );
+        result.push(...groupChildren);
+      }
+    }
+    return result;
   }
-  const newContent = proj.writeSync();
-  fs.writeFileSync(projectPath, newContent);
 }

package/src/nextjs/nextjs-wizard.ts

@@ -10,7 +10,7 @@ import * as path from 'path';
 import {
   abort,
   abortIfCancelled,
-  addSentryCliRc,
+  addSentryCliConfig,
   confirmContinueEvenThoughNoGitRepo,
   ensurePackageIsInstalled,
   getOrAskForProjectData,
@@ -28,6 +28,7 @@ import {
   getNextjsWebpackPluginOptionsTemplate,
   getSentryConfigContents,
   getSentryExampleApiRoute,
+  getSentryExampleAppDirApiRoute,
   getSentryExamplePageContents,
 } from './templates';
 
@@ -44,7 +45,7 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
   await ensurePackageIsInstalled(packageJson, 'next', 'Next.js');
 
   const { selectedProject, authToken, selfHosted, sentryUrl } =
-    await getOrAskForProjectData(options);
+    await getOrAskForProjectData(options, 'javascript-nextjs');
 
   await installPackage({
     packageName: '@sentry/nextjs',
@@ -279,8 +280,11 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
     }
   }
 
+  const srcDir = path.join(process.cwd(), 'src');
   const maybePagesDirPath = path.join(process.cwd(), 'pages');
-  const maybeSrcPagesDirPath = path.join(process.cwd(), 'src', 'pages');
+  const maybeSrcPagesDirPath = path.join(srcDir, 'pages');
+  const maybeAppDirPath = path.join(process.cwd(), 'app');
+  const maybeSrcAppDirPath = path.join(srcDir, 'app');
 
   let pagesLocation =
     fs.existsSync(maybePagesDirPath) &&
@@ -291,23 +295,83 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
       ? ['src', 'pages']
       : undefined;
 
-  if (!pagesLocation) {
-    pagesLocation = ['pages'];
+  const appLocation =
+    fs.existsSync(maybeAppDirPath) &&
+    fs.lstatSync(maybeAppDirPath).isDirectory()
+      ? ['app']
+      : fs.existsSync(maybeSrcAppDirPath) &&
+        fs.lstatSync(maybeSrcAppDirPath).isDirectory()
+      ? ['src', 'app']
+      : undefined;
+
+  if (!pagesLocation && !appLocation) {
+    pagesLocation =
+      fs.existsSync(srcDir) && fs.lstatSync(srcDir).isDirectory()
+        ? ['src', 'pages']
+        : ['pages'];
     fs.mkdirSync(path.join(process.cwd(), ...pagesLocation), {
       recursive: true,
     });
   }
 
-  if (pagesLocation) {
+  if (appLocation) {
+    const examplePageContents = getSentryExamplePageContents({
+      selfHosted,
+      orgSlug: selectedProject.organization.slug,
+      projectId: selectedProject.id,
+      url: sentryUrl,
+      useClient: true,
+    });
+
+    await fs.promises.writeFile(
+      path.join(
+        process.cwd(),
+        ...appLocation,
+        'sentry-example-page',
+        'page.jsx',
+      ),
+      examplePageContents,
+      { encoding: 'utf8', flag: 'w' },
+    );
+
+    clack.log.success(
+      `Created ${chalk.bold(
+        path.join(...appLocation, 'sentry-example-page', 'page.jsx'),
+      )}.`,
+    );
+
+    fs.mkdirSync(path.join(process.cwd(), ...appLocation, 'api'), {
+      recursive: true,
+    });
+
+    await fs.promises.writeFile(
+      path.join(
+        process.cwd(),
+        ...appLocation,
+        'api',
+        'sentry-example-api',
+        'route.js',
+      ),
+      getSentryExampleAppDirApiRoute(),
+      { encoding: 'utf8', flag: 'w' },
+    );
+
+    clack.log.success(
+      `Created ${chalk.bold(
+        path.join(...appLocation, 'api', 'sentry-example-api', 'route.js'),
+      )}.`,
+    );
+  } else if (pagesLocation) {
     const examplePageContents = getSentryExamplePageContents({
       selfHosted,
       orgSlug: selectedProject.organization.slug,
       projectId: selectedProject.id,
       url: sentryUrl,
+      useClient: false,
     });
 
     await fs.promises.writeFile(
-      path.join(process.cwd(), ...pagesLocation, 'sentry-example-page.js'),
+      path.join(process.cwd(), ...pagesLocation, 'sentry-example-page.jsx'),
       examplePageContents,
       { encoding: 'utf8', flag: 'w' },
     );
@@ -340,7 +404,7 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
     );
   }
 
-  await addSentryCliRc(authToken);
+  await addSentryCliConfig(authToken);
 
   const mightBeUsingVercel = fs.existsSync(
     path.join(process.cwd(), 'vercel.json'),

package/src/nextjs/templates.ts

@@ -150,15 +150,18 @@ export function getSentryExamplePageContents(options: {
   url: string;
   orgSlug: string;
   projectId: string;
+  useClient: boolean;
 }): string {
   const issuesPageLink = options.selfHosted
     ? `${options.url}organizations/${options.orgSlug}/issues/?project=${options.projectId}`
     : `https://${options.orgSlug}.sentry.io/issues/?project=${options.projectId}`;
 
-  return `import Head from "next/head";
+  return `${
+    options.useClient ? '"use client";\n\n' : ''
+  }import Head from "next/head";
 import * as Sentry from "@sentry/nextjs";
 
-export default function Home() {
+export default function Page() {
   return (
     <div>
       <Head>
@@ -250,3 +253,14 @@ export default function handler(_req, res) {
 }
 `;
 }
+
+export function getSentryExampleAppDirApiRoute() {
+  return `import { NextResponse } from "next/server";
+
+// A faulty API route to test Sentry's error monitoring
+export function GET() {
+  throw new Error("Sentry Example API Route Error");
+  return NextResponse.json({ data: "Testing Sentry Error..." });
+}
+`;
+}

package/src/remix/remix-wizard.ts

@@ -3,16 +3,15 @@ import clack from '@clack/prompts';
 import chalk from 'chalk';
 
 import {
-  addSentryCliRc,
-  askForProjectSelection,
-  askForSelfHosted,
-  askForWizardLogin,
+  addSentryCliConfig,
   confirmContinueEvenThoughNoGitRepo,
   ensurePackageIsInstalled,
+  getOrAskForProjectData,
   getPackageDotJson,
   installPackage,
   isUsingTypeScript,
   printWelcome,
+  sourceMapsCliSetupConfig,
 } from '../utils/clack-utils';
 import { hasPackageInstalled } from '../utils/package-json';
 import { WizardOptions } from '../utils/types';
@@ -54,15 +53,10 @@ async function runRemixWizardWithTelemetry(
   // We expect `@remix-run/dev` to be installed for every Remix project
   await ensurePackageIsInstalled(packageJson, '@remix-run/dev', 'Remix');
 
-  const { url: sentryUrl } = await askForSelfHosted(options.url);
-
-  const { projects, apiKeys } = await askForWizardLogin({
-    promoCode: options.promoCode,
-    url: sentryUrl,
-    platform: 'javascript-remix',
-  });
-
-  const selectedProject = await askForProjectSelection(projects);
+  const { selectedProject, authToken } = await getOrAskForProjectData(
+    options,
+    'javascript-remix',
+  );
 
   await traceStep('Install Sentry SDK', () =>
     installPackage({
@@ -76,8 +70,9 @@ async function runRemixWizardWithTelemetry(
   const isTS = isUsingTypeScript();
   const isV2 = isRemixV2(remixConfig, packageJson);
 
-  await addSentryCliRc(
-    apiKeys.token,
+  await addSentryCliConfig(
+    authToken,
+    sourceMapsCliSetupConfig,
     selectedProject.organization.slug,
     selectedProject.name,
   );

package/src/sourcemaps/sourcemaps-wizard.ts

@@ -4,9 +4,9 @@ import chalk from 'chalk';
 import * as Sentry from '@sentry/node';
 
 import {
+  abort,
   abortIfCancelled,
   confirmContinueEvenThoughNoGitRepo,
-  detectPackageManager,
   SENTRY_DOT_ENV_FILE,
   printWelcome,
   SENTRY_CLI_RC_FILE,
@@ -30,6 +30,7 @@ import { configureAngularSourcemapGenerationFlow } from './tools/angular';
 import { detectUsedTool, SupportedTools } from './utils/detect-tool';
 import { configureNextJsSourceMapsUpload } from './tools/nextjs';
 import { configureRemixSourceMapsUpload } from './tools/remix';
+import { detectPackageManger } from '../utils/package-manager';
 
 export async function runSourcemapsWizard(
   options: WizardOptions,
@@ -89,6 +90,14 @@ You can turn this off by running the wizard with the '--disable-telemetry' flag.
 
   Sentry.setTag('selected-tool', selectedTool);
 
+  if (selectedTool === 'no-tool') {
+    clack.log.info(
+      "No Problem! But in this case, there's nothing to configure :)",
+    );
+    await abort('Exiting, have a great day!', 0);
+    return;
+  }
+
   await traceStep('tool-setup', () =>
     startToolSetupFlow(
       selectedTool,
@@ -115,7 +124,7 @@ You can turn this off by running the wizard with the '--disable-telemetry' flag.
 }
 
 async function askForUsedBundlerTool(): Promise<SupportedTools> {
-  const selectedTool: SupportedTools | symbol = await abortIfCancelled(
+  const selectedTool = await abortIfCancelled(
     clack.select({
       message: 'Which framework, bundler or build tool are you using?',
       options: [
@@ -165,10 +174,15 @@ async function askForUsedBundlerTool(): Promise<SupportedTools> {
           hint: 'Configure source maps when using tsc as build tool',
         },
         {
-          label: 'None of the above',
+          label: 'I use another tool',
           value: 'sentry-cli',
           hint: 'This will configure source maps upload for you using sentry-cli',
         },
+        {
+          label: "I don't minify, transpile or bundle my code",
+          value: 'no-tool',
+          hint: 'This will exit the wizard',
+        },
       ],
       initialValue: await detectUsedTool(),
     }),
@@ -317,8 +331,8 @@ SENTRY_AUTH_TOKEN=${authToken}
 }
 
 function printOutro(url: string, orgSlug: string, projectId: string) {
-  const pacMan = detectPackageManager() || 'npm';
-  const buildCommand = `'${pacMan}${pacMan === 'npm' ? ' run' : ''} build'`;
+  const packageManager = detectPackageManger();
+  const buildCommand = packageManager?.buildCommand ?? 'npm run build';
 
   const urlObject = new URL(url);
   urlObject.host = `${orgSlug}.${urlObject.host}`;

package/src/sourcemaps/tools/nextjs.ts

@@ -3,7 +3,7 @@ import * as clack from '@clack/prompts';
 import chalk from 'chalk';
 import { runNextjsWizard } from '../../nextjs/nextjs-wizard';
 import { traceStep } from '../../telemetry';
-import { abortIfCancelled, addSentryCliRc } from '../../utils/clack-utils';
+import { abortIfCancelled, addSentryCliConfig } from '../../utils/clack-utils';
 import { WizardOptions } from '../../utils/types';
 
 import { SourceMapUploadToolConfigurationOptions } from './types';
@@ -99,7 +99,7 @@ In case you already tried the wizard, we can also show you how to configure your
     );
 
     await traceStep('nextjs-manual-sentryclirc', () =>
-      addSentryCliRc(options.authToken),
+      addSentryCliConfig(options.authToken),
     );
   }
 

package/src/sourcemaps/tools/sentry-cli.ts

@@ -6,8 +6,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import {
   abortIfCancelled,
-  addSentryCliRc,
-  detectPackageManager,
+  addSentryCliConfig,
   getPackageDotJson,
   installPackage,
 } from '../../utils/clack-utils';
@@ -15,6 +14,7 @@ import {
 import { SourceMapUploadToolConfigurationOptions } from './types';
 import { hasPackageInstalled, PackageDotJson } from '../../utils/package-json';
 import { traceStep } from '../../telemetry';
+import { detectPackageManger } from '../../utils/package-manager';
 
 const SENTRY_NPM_SCRIPT_NAME = 'sentry:sourcemaps';
 
@@ -96,7 +96,7 @@ export async function configureSentryCLI(
     );
   }
 
-  await addSentryCliRc(options.authToken);
+  await addSentryCliConfig(options.authToken);
 }
 
 export async function setupNpmScriptInCI(): Promise<void> {
@@ -205,7 +205,8 @@ async function addSentryCommandToBuildCommand(
     (s) => s !== SENTRY_NPM_SCRIPT_NAME,
   );
 
-  const pacMan = detectPackageManager() || 'npm';
+  const packageManager = detectPackageManger();
+  const packageManagerName = packageManager?.name ?? 'npm';
 
   // Heuristic to pre-select the build command:
   // Often, 'build' is the prod build command, so we favour it.
@@ -220,7 +221,7 @@ async function addSentryCommandToBuildCommand(
     (await abortIfCancelled(
       clack.confirm({
         message: `Is ${chalk.cyan(
-          `${pacMan} run ${buildCommand}`,
+          `${packageManagerName} run ${buildCommand}`,
         )} your production build command?`,
       }),
     ));
@@ -228,7 +229,7 @@ async function addSentryCommandToBuildCommand(
   if (allNpmScripts.length && (!buildCommand || !isProdBuildCommand)) {
     buildCommand = await abortIfCancelled(
       clack.select({
-        message: `Which ${pacMan} command in your ${chalk.cyan(
+        message: `Which ${packageManagerName} command in your ${chalk.cyan(
           'package.json',
         )} builds your application for production?`,
         options: allNpmScripts
@@ -254,7 +255,7 @@ Please add it manually to your prod build command.`,
   packageDotJson.scripts[
     buildCommand
     // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-  ] = `${packageDotJson.scripts[buildCommand]} && ${pacMan} run ${SENTRY_NPM_SCRIPT_NAME}`;
+  ] = `${packageDotJson.scripts[buildCommand]} && ${packageManager} run ${SENTRY_NPM_SCRIPT_NAME}`;
 
   await fs.promises.writeFile(
     path.join(process.cwd(), 'package.json'),