@sentry/wizard 3.11.0 → 3.13.0

package/dist/test/utils/clack-utils.test.js

@@ -0,0 +1,200 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var clack_utils_1 = require("../../src/utils/clack-utils");
+var fs = __importStar(require("fs"));
+var clackMock;
+jest.mock('@clack/prompts', function () {
+    clackMock = {
+        log: {
+            info: jest.fn(),
+            success: jest.fn(),
+            warn: jest.fn(),
+        },
+        text: jest.fn(),
+        confirm: jest.fn(),
+        cancel: jest.fn(),
+        // passthrough for abortIfCancelled
+        isCancel: jest.fn().mockReturnValue(false),
+    };
+    return clackMock;
+});
+function mockUserResponse(fn, response) {
+    fn.mockReturnValueOnce(response);
+}
+describe('askForToolConfigPath', function () {
+    afterEach(function () {
+        jest.clearAllMocks();
+    });
+    it('returns undefined if users have no config file', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    mockUserResponse(clackMock.confirm, false);
+                    return [4 /*yield*/, (0, clack_utils_1.askForToolConfigPath)('Webpack', 'webpack.config.js')];
+                case 1:
+                    result = _a.sent();
+                    expect(clackMock.confirm).toHaveBeenCalledWith(expect.objectContaining({
+                        message: expect.stringContaining('have a Webpack config file'),
+                    }));
+                    expect(result).toBeUndefined();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('returns the path if users have a config file and the entered path is valid', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    mockUserResponse(clackMock.confirm, true);
+                    mockUserResponse(clackMock.text, 'my.webpack.config.js');
+                    return [4 /*yield*/, (0, clack_utils_1.askForToolConfigPath)('Webpack', 'webpack.config.js')];
+                case 1:
+                    result = _a.sent();
+                    expect(clackMock.confirm).toHaveBeenCalledWith(expect.objectContaining({
+                        message: expect.stringContaining('have a Webpack config file'),
+                    }));
+                    expect(clackMock.text).toHaveBeenCalledWith(expect.objectContaining({
+                        message: expect.stringContaining('enter the path to your Webpack config file'),
+                    }));
+                    expect(result).toBe('my.webpack.config.js');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
+describe('createNewConfigFile', function () {
+    afterEach(function () {
+        jest.clearAllMocks();
+    });
+    it('writes the file to disk and returns true if the file was created successfully', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var writeFileSpy, filename, code, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    writeFileSpy = jest
+                        .spyOn(fs.promises, 'writeFile')
+                        .mockImplementation(jest.fn());
+                    filename = '/weboack.config.js';
+                    code = "module.exports = {/*config...*/}";
+                    return [4 /*yield*/, (0, clack_utils_1.createNewConfigFile)(filename, code)];
+                case 1:
+                    result = _a.sent();
+                    expect(result).toBe(true);
+                    expect(writeFileSpy).toHaveBeenCalledWith(filename, code);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('logs more information if provided as an argument', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var filename, code, moreInfo;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    jest.spyOn(fs.promises, 'writeFile').mockImplementation(jest.fn());
+                    filename = '/weboack.config.js';
+                    code = "module.exports = {/*config...*/}";
+                    moreInfo = 'More information...';
+                    return [4 /*yield*/, (0, clack_utils_1.createNewConfigFile)(filename, code, moreInfo)];
+                case 1:
+                    _a.sent();
+                    expect(clackMock.log.info).toHaveBeenCalledTimes(1);
+                    expect(clackMock.log.info).toHaveBeenCalledWith(expect.stringContaining(moreInfo));
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('returns false and logs a warning if the file could not be created', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var writeFileSpy, filename, code, result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    writeFileSpy = jest
+                        .spyOn(fs.promises, 'writeFile')
+                        .mockImplementation(function () { return Promise.reject(new Error('Could not write')); });
+                    filename = '/webpack.config.js';
+                    code = "module.exports = {/*config...*/}";
+                    return [4 /*yield*/, (0, clack_utils_1.createNewConfigFile)(filename, code)];
+                case 1:
+                    result = _a.sent();
+                    expect(result).toBe(false);
+                    expect(writeFileSpy).toHaveBeenCalledWith(filename, code);
+                    expect(clackMock.log.warn).toHaveBeenCalledTimes(1);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('returns false if the passed path is not absolute', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var result;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, clack_utils_1.createNewConfigFile)('./relative/webpack.config.js', '')];
+                case 1:
+                    result = _a.sent();
+                    expect(result).toBe(false);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
+//# sourceMappingURL=clack-utils.test.js.map

package/dist/test/utils/clack-utils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clack-utils.test.js","sourceRoot":"","sources":["../../../test/utils/clack-utils.test.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  askForToolConfigPath,\n  createNewConfigFile,\n} from '../../src/utils/clack-utils';\n\nimport * as fs from 'fs';\n\ntype ClackMock = {\n  confirm: jest.Mock;\n  text: jest.Mock;\n  isCancel: jest.Mock;\n  cancel: jest.Mock;\n  log: {\n    info: jest.Mock;\n    success: jest.Mock;\n    warn: jest.Mock;\n  };\n};\n\nlet clackMock: ClackMock;\n\njest.mock('@clack/prompts', () => {\n  clackMock = {\n    log: {\n      info: jest.fn(),\n      success: jest.fn(),\n      warn: jest.fn(),\n    },\n    text: jest.fn(),\n    confirm: jest.fn(),\n    cancel: jest.fn(),\n    // passthrough for abortIfCancelled\n    isCancel: jest.fn().mockReturnValue(false),\n  };\n  return clackMock;\n});\n\nfunction mockUserResponse(fn: jest.Mock, response: any) {\n  fn.mockReturnValueOnce(response);\n}\n\ndescribe('askForToolConfigPath', () => {\n  afterEach(() => {\n    jest.clearAllMocks();\n  });\n\n  it('returns undefined if users have no config file', async () => {\n    mockUserResponse(clackMock.confirm, false);\n\n    const result = await askForToolConfigPath('Webpack', 'webpack.config.js');\n\n    expect(clackMock.confirm).toHaveBeenCalledWith(\n      expect.objectContaining({\n        message: expect.stringContaining('have a Webpack config file'),\n      }),\n    );\n\n    expect(result).toBeUndefined();\n  });\n\n  it('returns the path if users have a config file and the entered path is valid', async () => {\n    mockUserResponse(clackMock.confirm, true);\n    mockUserResponse(clackMock.text, 'my.webpack.config.js');\n\n    const result = await askForToolConfigPath('Webpack', 'webpack.config.js');\n\n    expect(clackMock.confirm).toHaveBeenCalledWith(\n      expect.objectContaining({\n        message: expect.stringContaining('have a Webpack config file'),\n      }),\n    );\n\n    expect(clackMock.text).toHaveBeenCalledWith(\n      expect.objectContaining({\n        message: expect.stringContaining(\n          'enter the path to your Webpack config file',\n        ),\n      }),\n    );\n\n    expect(result).toBe('my.webpack.config.js');\n  });\n});\n\ndescribe('createNewConfigFile', () => {\n  afterEach(() => {\n    jest.clearAllMocks();\n  });\n\n  it('writes the file to disk and returns true if the file was created successfully', async () => {\n    const writeFileSpy = jest\n      .spyOn(fs.promises, 'writeFile')\n      .mockImplementation(jest.fn());\n\n    const filename = '/weboack.config.js';\n    const code = `module.exports = {/*config...*/}`;\n\n    const result = await createNewConfigFile(filename, code);\n\n    expect(result).toBe(true);\n    expect(writeFileSpy).toHaveBeenCalledWith(filename, code);\n  });\n\n  it('logs more information if provided as an argument', async () => {\n    jest.spyOn(fs.promises, 'writeFile').mockImplementation(jest.fn());\n\n    const filename = '/weboack.config.js';\n    const code = `module.exports = {/*config...*/}`;\n    const moreInfo = 'More information...';\n\n    await createNewConfigFile(filename, code, moreInfo);\n\n    expect(clackMock.log.info).toHaveBeenCalledTimes(1);\n    expect(clackMock.log.info).toHaveBeenCalledWith(\n      expect.stringContaining(moreInfo),\n    );\n  });\n\n  it('returns false and logs a warning if the file could not be created', async () => {\n    const writeFileSpy = jest\n      .spyOn(fs.promises, 'writeFile')\n      .mockImplementation(() => Promise.reject(new Error('Could not write')));\n\n    const filename = '/webpack.config.js';\n    const code = `module.exports = {/*config...*/}`;\n\n    const result = await createNewConfigFile(filename, code);\n\n    expect(result).toBe(false);\n    expect(writeFileSpy).toHaveBeenCalledWith(filename, code);\n    expect(clackMock.log.warn).toHaveBeenCalledTimes(1);\n  });\n\n  it('returns false if the passed path is not absolute', async () => {\n    const result = await createNewConfigFile(\n      './relative/webpack.config.js',\n      '',\n    );\n\n    expect(result).toBe(false);\n  });\n});\n"]}

package/lib/Steps/ChooseIntegration.ts

@@ -113,6 +113,7 @@ export class ChooseIntegration extends BaseStep {
           message: 'What platform do you want to set up?',
           name: 'integration',
           type: 'list',
+          pageSize: 10,
         },
       ]);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wizard",
-  "version": "3.11.0",
+  "version": "3.13.0",
   "homepage": "https://github.com/getsentry/sentry-wizard",
   "repository": "https://github.com/getsentry/sentry-wizard",
   "description": "Sentry wizard helping you to configure your project",

package/src/android/android-wizard.ts

@@ -3,6 +3,7 @@ import * as fs from 'fs';
 // @ts-ignore - clack is ESM and TS complains about that. It works though
 import * as clack from '@clack/prompts';
 import * as path from 'path';
+import * as Sentry from '@sentry/node';
 import * as gradle from './gradle';
 import * as manifest from './manifest';
 import * as codetools from './code-tools';
@@ -69,6 +70,7 @@ async function runAndroidWizardWithTelemetry(
     clack.log.error(
       'No Gradle project found. Please run this command from the root of your project.',
     );
+    Sentry.captureException('No Gradle project found');
     await abort();
     return;
   }
@@ -77,10 +79,8 @@ async function runAndroidWizardWithTelemetry(
     gradle.selectAppFile(buildGradleFiles),
   );
 
-  const { selectedProject, authToken } = await getOrAskForProjectData(
-    options,
-    'android',
-  );
+  const { selectedProject, selfHosted, sentryUrl, authToken } =
+    await getOrAskForProjectData(options, 'android');
 
   // ======== STEP 1. Add Sentry Gradle Plugin to build.gradle(.kts) ============
   clack.log.step(
@@ -100,6 +100,7 @@ async function runAndroidWizardWithTelemetry(
       "Could not add Sentry Gradle plugin to your app's build.gradle file. You'll have to add it manually.\nPlease follow the instructions at https://docs.sentry.io/platforms/android/#install",
     );
   }
+  Sentry.setTag('gradle-plugin-added', pluginAdded);
 
   // ======== STEP 2. Configure Sentry SDK via AndroidManifest ============
   clack.log.step(
@@ -119,6 +120,7 @@ async function runAndroidWizardWithTelemetry(
       "Could not configure the Sentry SDK. You'll have to do it manually.\nPlease follow the instructions at https://docs.sentry.io/platforms/android/#configure",
     );
   }
+  Sentry.setTag('android-manifest-updated', manifestUpdated);
 
   // ======== STEP 3. Patch Main Activity with a test error snippet ============
   clack.log.step(
@@ -133,10 +135,13 @@ async function runAndroidWizardWithTelemetry(
     packageName = gradle.getNamespace(appFile);
   }
   const activityName = mainActivity.activityName;
+  Sentry.setTag('has-activity-name', !!activityName);
+  Sentry.setTag('has-package-name', !!packageName);
   if (!activityName || !packageName) {
     clack.log.warn(
       "Could not find Activity with intent action MAIN. You'll have to manually verify the setup.\nPlease follow the instructions at https://docs.sentry.io/platforms/android/#verify",
     );
+    Sentry.captureException('Could not find Main Activity');
   } else {
     const packageNameStable = packageName;
     const activityFile = traceStep('Find Main Activity Source File', () =>
@@ -151,6 +156,7 @@ async function runAndroidWizardWithTelemetry(
         "Could not patch main activity. You'll have to manually verify the setup.\nPlease follow the instructions at https://docs.sentry.io/platforms/android/#verify",
       );
     }
+    Sentry.setTag('main-activity-patched', activityPatched);
   }
 
   // ======== STEP 4. Add sentry-cli config file ============
@@ -164,11 +170,16 @@ async function runAndroidWizardWithTelemetry(
   );
 
   // ======== OUTRO ========
+  const issuesPageLink = selfHosted
+    ? `${sentryUrl}organizations/${selectedProject.organization.slug}/issues/?project=${selectedProject.id}`
+    : `https://${selectedProject.organization.slug}.sentry.io/issues/?project=${selectedProject.id}`;
+
   clack.outro(`
 ${chalk.greenBright('Successfully installed the Sentry Android SDK!')}
 
 ${chalk.cyan(
-  'You can validate your setup by launching your application and checking Sentry issues page afterwards',
+  `You can validate your setup by launching your application and checking Sentry issues page afterwards
+${issuesPageLink}`,
 )}
 
 Check out the SDK documentation for further configuration:

package/src/android/code-tools.ts

@@ -103,13 +103,8 @@ export function patchMainActivity(activityFile: string | undefined): boolean {
     return true;
   }
 
-  const importRegex = /import\s+[\w.]+;?/gim;
-  let importsMatch = importRegex.exec(activityContent);
-  let importIndex = 0;
-  while (importsMatch) {
-    importIndex = importsMatch.index + importsMatch[0].length + 1;
-    importsMatch = importRegex.exec(activityContent);
-  }
+  const importIndex = getLastImportLineLocation(activityContent);
+
   let newActivityContent;
   if (activityFile.endsWith('.kt')) {
     newActivityContent =
@@ -154,3 +149,22 @@ export function patchMainActivity(activityFile: string | undefined): boolean {
 
   return true;
 }
+
+/**
+ * Returns the string index of the last import statement in the given code file.
+ * Works for both Java and Kotlin import statements.
+ *
+ * @param sourceCode
+ * @returns the insert index, or 0 if none found.
+ */
+export function getLastImportLineLocation(sourceCode: string): number {
+  const importRegex = /import(?:\sstatic)?\s+[\w.*]+(?: as [\w.]+)?;?/gim;
+
+  let importsMatch = importRegex.exec(sourceCode);
+  let importIndex = 0;
+  while (importsMatch) {
+    importIndex = importsMatch.index + importsMatch[0].length + 1;
+    importsMatch = importRegex.exec(sourceCode);
+  }
+  return importIndex;
+}

package/src/android/gradle.ts

@@ -48,7 +48,12 @@ export async function selectAppFile(
     const appFile = await abortIfCancelled(
       clack.text({
         message: `Unable to find your app's directory. 
-        Please enter the relative path to your app's build.gradle file from the root project (e.g. "app/build.gradle.kts")`,
+        Please enter the relative path to your app's build.gradle file from the root project`,
+        placeholder: 'app/build.gradle.kts',
+        validate(value) {
+          if (!value.includes('.gradle') || !fs.existsSync(value))
+            return `Not a valid gradle file.`;
+        },
       }),
     );
     return appFile;

package/src/nextjs/nextjs-wizard.ts

@@ -118,6 +118,8 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
   const sentryWebpackOptionsTemplate = getNextjsWebpackPluginOptionsTemplate(
     selectedProject.organization.slug,
     selectedProject.slug,
+    selfHosted,
+    sentryUrl,
   );
   const sentryBuildOptionsTemplate = getNextjsSentryBuildOptionsTemplate();
 
@@ -323,6 +325,13 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
       useClient: true,
     });
 
+    fs.mkdirSync(
+      path.join(process.cwd(), ...appLocation, 'sentry-example-page'),
+      {
+        recursive: true,
+      },
+    );
+
     await fs.promises.writeFile(
       path.join(
         process.cwd(),
@@ -340,9 +349,12 @@ export async function runNextjsWizard(options: WizardOptions): Promise<void> {
       )}.`,
     );
 
-    fs.mkdirSync(path.join(process.cwd(), ...appLocation, 'api'), {
-      recursive: true,
-    });
+    fs.mkdirSync(
+      path.join(process.cwd(), ...appLocation, 'api', 'sentry-example-api'),
+      {
+        recursive: true,
+      },
+    );
 
     await fs.promises.writeFile(
       path.join(

package/src/nextjs/templates.ts

@@ -1,6 +1,8 @@
 export function getNextjsWebpackPluginOptionsTemplate(
   orgSlug: string,
   projectSlug: string,
+  selfHosted: boolean,
+  url: string,
 ): string {
   return `{
     // For all available options, see:
@@ -8,9 +10,8 @@ export function getNextjsWebpackPluginOptionsTemplate(
 
     // Suppresses source map uploading logs during build
     silent: true,
-
     org: "${orgSlug}",
-    project: "${projectSlug}",
+    project: "${projectSlug}",${selfHosted ? `\n    url: "${url}"` : ''}
   }`;
 }
 

package/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.

package/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

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

@@ -1,5 +1,5 @@
 // @ts-ignore - clack is ESM and TS complains about that. It works though
-import clack from '@clack/prompts';
+import * as clack from '@clack/prompts';
 import chalk from 'chalk';
 import * as Sentry from '@sentry/node';
 import * as path from 'path';
@@ -14,7 +14,7 @@ import {
 import { SourceMapUploadToolConfigurationOptions } from './types';
 import { hasPackageInstalled, PackageDotJson } from '../../utils/package-json';
 import { traceStep } from '../../telemetry';
-import { detectPackageManger } from '../../utils/package-manager';
+import { detectPackageManger, NPM } from '../../utils/package-manager';
 
 const SENTRY_NPM_SCRIPT_NAME = 'sentry:sourcemaps';
 
@@ -194,7 +194,7 @@ async function askShouldAddToBuildCommand(): Promise<boolean> {
  *
  * @param packageDotJson The package.json which will be modified.
  */
-async function addSentryCommandToBuildCommand(
+export async function addSentryCommandToBuildCommand(
   packageDotJson: PackageDotJson,
 ): Promise<void> {
   // This usually shouldn't happen because earlier we added the
@@ -205,8 +205,7 @@ async function addSentryCommandToBuildCommand(
     (s) => s !== SENTRY_NPM_SCRIPT_NAME,
   );
 
-  const packageManager = detectPackageManger();
-  const packageManagerName = packageManager?.name ?? 'npm';
+  const packageManager = detectPackageManger() ?? NPM;
 
   // Heuristic to pre-select the build command:
   // Often, 'build' is the prod build command, so we favour it.
@@ -221,7 +220,7 @@ async function addSentryCommandToBuildCommand(
     (await abortIfCancelled(
       clack.confirm({
         message: `Is ${chalk.cyan(
-          `${packageManagerName} run ${buildCommand}`,
+          `${packageManager.runScriptCommand} ${buildCommand}`,
         )} your production build command?`,
       }),
     ));
@@ -229,7 +228,7 @@ async function addSentryCommandToBuildCommand(
   if (allNpmScripts.length && (!buildCommand || !isProdBuildCommand)) {
     buildCommand = await abortIfCancelled(
       clack.select({
-        message: `Which ${packageManagerName} command in your ${chalk.cyan(
+        message: `Which ${packageManager.name} command in your ${chalk.cyan(
           'package.json',
         )} builds your application for production?`,
         options: allNpmScripts
@@ -252,10 +251,18 @@ Please add it manually to your prod build command.`,
     return;
   }
 
+  const oldCommand = packageDotJson.scripts[buildCommand];
+  if (!oldCommand) {
+    // very unlikely to happen but nevertheless
+    clack.log.warn(
+      `\`${buildCommand}\` doesn't seem to be part of your package.json scripts`,
+    );
+    return;
+  }
+
   packageDotJson.scripts[
     buildCommand
-    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-  ] = `${packageDotJson.scripts[buildCommand]} && ${packageManager} run ${SENTRY_NPM_SCRIPT_NAME}`;
+  ] = `${oldCommand} && ${packageManager.runScriptCommand} ${SENTRY_NPM_SCRIPT_NAME}`;
 
   await fs.promises.writeFile(
     path.join(process.cwd(), 'package.json'),