@sentry/wizard 3.8.0 → 3.9.1

package/dist/src/sveltekit/sveltekit-wizard.js

@@ -47,10 +47,9 @@ var clack_utils_1 = require("../utils/clack-utils");
 var package_json_1 = require("../utils/package-json");
 var sdk_example_1 = require("./sdk-example");
 var sdk_setup_1 = require("./sdk-setup");
-var sentry_cli_setup_1 = require("./sentry-cli-setup");
 function runSvelteKitWizard(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var packageJson, _a, sentryUrl, selfHosted, _b, projects, apiKeys, selectedProject, dsn, svelteConfig, e_1, e_2;
+        var packageJson, _a, sentryUrl, selfHosted, _b, projects, apiKeys, selectedProject, svelteConfig, e_1, e_2;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -86,17 +85,22 @@ function runSvelteKitWizard(options) {
                         })];
                 case 7:
                     _c.sent();
-                    return [4 /*yield*/, (0, sentry_cli_setup_1.setupCLIConfig)(apiKeys.token, selectedProject, sentryUrl)];
+                    return [4 /*yield*/, (0, clack_utils_1.addSentryCliRc)(apiKeys.token)];
                 case 8:
                     _c.sent();
-                    dsn = selectedProject.keys[0].dsn.public;
                     return [4 /*yield*/, (0, sdk_setup_1.loadSvelteConfig)()];
                 case 9:
                     svelteConfig = _c.sent();
                     _c.label = 10;
                 case 10:
                     _c.trys.push([10, 12, , 14]);
-                    return [4 /*yield*/, (0, sdk_setup_1.createOrMergeSvelteKitFiles)(dsn, svelteConfig)];
+                    return [4 /*yield*/, (0, sdk_setup_1.createOrMergeSvelteKitFiles)({
+                            dsn: selectedProject.keys[0].dsn.public,
+                            org: selectedProject.organization.slug,
+                            project: selectedProject.slug,
+                            selfHosted: selfHosted,
+                            url: sentryUrl,
+                        }, svelteConfig)];
                 case 11:
                     _c.sent();
                     return [3 /*break*/, 14];

package/dist/src/sveltekit/sveltekit-wizard.js.map

@@ -1 +1 @@
-{"version":3,"file":"sveltekit-wizard.js","sourceRoot":"","sources":["../../../src/sveltekit/sveltekit-wizard.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-ignore - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\n\nimport {\n  abort,\n  askForProjectSelection,\n  askForSelfHosted,\n  askForWizardLogin,\n  confirmContinueEvenThoughNoGitRepo,\n  ensurePackageIsInstalled,\n  getPackageDotJson,\n  installPackage,\n  printWelcome,\n} from '../utils/clack-utils';\nimport { hasPackageInstalled } from '../utils/package-json';\nimport { WizardOptions } from '../utils/types';\nimport { createExamplePage } from './sdk-example';\nimport { createOrMergeSvelteKitFiles, loadSvelteConfig } from './sdk-setup';\n\nimport { setupCLIConfig } from './sentry-cli-setup';\n\nexport async function runSvelteKitWizard(\n  options: WizardOptions,\n): Promise<void> {\n  printWelcome({\n    wizardName: 'Sentry SvelteKit Wizard',\n    promoCode: options.promoCode,\n  });\n\n  await confirmContinueEvenThoughNoGitRepo();\n\n  const packageJson = await getPackageDotJson();\n  await ensurePackageIsInstalled(packageJson, '@sveltejs/kit', 'Sveltekit');\n\n  const { url: sentryUrl, selfHosted } = await askForSelfHosted(options.url);\n\n  const { projects, apiKeys } = await askForWizardLogin({\n    promoCode: options.promoCode,\n    url: sentryUrl,\n    platform: 'javascript-sveltekit',\n  });\n\n  const selectedProject = await askForProjectSelection(projects);\n\n  await installPackage({\n    packageName: '@sentry/sveltekit',\n    alreadyInstalled: hasPackageInstalled('@sentry/sveltekit', packageJson),\n  });\n\n  await setupCLIConfig(apiKeys.token, selectedProject, sentryUrl);\n\n  const dsn = selectedProject.keys[0].dsn.public;\n\n  const svelteConfig = await loadSvelteConfig();\n\n  try {\n    await createOrMergeSvelteKitFiles(dsn, svelteConfig);\n  } catch (e: unknown) {\n    clack.log.error('Error while setting up the SvelteKit SDK:');\n    clack.log.info(\n      chalk.dim(\n        typeof e === 'object' && e != null && 'toString' in e\n          ? e.toString()\n          : typeof e === 'string'\n          ? e\n          : 'Unknown error',\n      ),\n    );\n    await abort('Exiting Wizard');\n    return;\n  }\n\n  try {\n    await createExamplePage(svelteConfig, {\n      selfHosted,\n      url: sentryUrl,\n      orgSlug: selectedProject.organization.slug,\n      projectId: selectedProject.id,\n    });\n  } catch (e: unknown) {\n    clack.log.error('Error while creating an example page to test Sentry:');\n    clack.log.info(\n      chalk.dim(\n        typeof e === 'object' && e != null && 'toString' in e\n          ? e.toString()\n          : typeof e === 'string'\n          ? e\n          : 'Unknown error',\n      ),\n    );\n    await abort('Exiting Wizard');\n    return;\n  }\n\n  clack.outro(`\n${chalk.green('Successfully installed the Sentry SvelteKit SDK!')}\n\n${chalk.cyan(\n  'You can validate your setup by starting your dev environment (`npm run dev`) and visiting \"/sentry-example\".',\n)}\n\nCheck out the SDK documentation for further configuration:\nhttps://docs.sentry.io/platforms/javascript/guides/sveltekit/\n  `);\n}\n"]}
+{"version":3,"file":"sveltekit-wizard.js","sourceRoot":"","sources":["../../../src/sveltekit/sveltekit-wizard.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-ignore - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\n\nimport {\n  abort,\n  addSentryCliRc,\n  askForProjectSelection,\n  askForSelfHosted,\n  askForWizardLogin,\n  confirmContinueEvenThoughNoGitRepo,\n  ensurePackageIsInstalled,\n  getPackageDotJson,\n  installPackage,\n  printWelcome,\n} from '../utils/clack-utils';\nimport { hasPackageInstalled } from '../utils/package-json';\nimport { WizardOptions } from '../utils/types';\nimport { createExamplePage } from './sdk-example';\nimport { createOrMergeSvelteKitFiles, loadSvelteConfig } from './sdk-setup';\n\nexport async function runSvelteKitWizard(\n  options: WizardOptions,\n): Promise<void> {\n  printWelcome({\n    wizardName: 'Sentry SvelteKit Wizard',\n    promoCode: options.promoCode,\n  });\n\n  await confirmContinueEvenThoughNoGitRepo();\n\n  const packageJson = await getPackageDotJson();\n  await ensurePackageIsInstalled(packageJson, '@sveltejs/kit', 'Sveltekit');\n\n  const { url: sentryUrl, selfHosted } = await askForSelfHosted(options.url);\n\n  const { projects, apiKeys } = await askForWizardLogin({\n    promoCode: options.promoCode,\n    url: sentryUrl,\n    platform: 'javascript-sveltekit',\n  });\n\n  const selectedProject = await askForProjectSelection(projects);\n\n  await installPackage({\n    packageName: '@sentry/sveltekit',\n    alreadyInstalled: hasPackageInstalled('@sentry/sveltekit', packageJson),\n  });\n\n  await addSentryCliRc(apiKeys.token);\n\n  const svelteConfig = await loadSvelteConfig();\n\n  try {\n    await createOrMergeSvelteKitFiles(\n      {\n        dsn: selectedProject.keys[0].dsn.public,\n        org: selectedProject.organization.slug,\n        project: selectedProject.slug,\n        selfHosted,\n        url: sentryUrl,\n      },\n      svelteConfig,\n    );\n  } catch (e: unknown) {\n    clack.log.error('Error while setting up the SvelteKit SDK:');\n    clack.log.info(\n      chalk.dim(\n        typeof e === 'object' && e != null && 'toString' in e\n          ? e.toString()\n          : typeof e === 'string'\n          ? e\n          : 'Unknown error',\n      ),\n    );\n    await abort('Exiting Wizard');\n    return;\n  }\n\n  try {\n    await createExamplePage(svelteConfig, {\n      selfHosted,\n      url: sentryUrl,\n      orgSlug: selectedProject.organization.slug,\n      projectId: selectedProject.id,\n    });\n  } catch (e: unknown) {\n    clack.log.error('Error while creating an example page to test Sentry:');\n    clack.log.info(\n      chalk.dim(\n        typeof e === 'object' && e != null && 'toString' in e\n          ? e.toString()\n          : typeof e === 'string'\n          ? e\n          : 'Unknown error',\n      ),\n    );\n    await abort('Exiting Wizard');\n    return;\n  }\n\n  clack.outro(`\n${chalk.green('Successfully installed the Sentry SvelteKit SDK!')}\n\n${chalk.cyan(\n  'You can validate your setup by starting your dev environment (`npm run dev`) and visiting \"/sentry-example\".',\n)}\n\nCheck out the SDK documentation for further configuration:\nhttps://docs.sentry.io/platforms/javascript/guides/sveltekit/\n  `);\n}\n"]}

package/dist/src/utils/ast-utils.d.ts

@@ -0,0 +1,8 @@
+import { ProxifiedModule } from 'magicast';
+/**
+ * Checks if a JS/TS file where we don't know its concrete file type yet exists
+ * and returns the full path to the file with the correct file type.
+ */
+export declare function findScriptFile(hooksFile: string): string | undefined;
+/** Checks if a Sentry package is already mentioned in the file */
+export declare function hasSentryContent(mod: ProxifiedModule<object>): boolean;

package/dist/src/utils/ast-utils.js

@@ -0,0 +1,45 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasSentryContent = exports.findScriptFile = void 0;
+var fs = __importStar(require("fs"));
+/**
+ * Checks if a JS/TS file where we don't know its concrete file type yet exists
+ * and returns the full path to the file with the correct file type.
+ */
+function findScriptFile(hooksFile) {
+    var possibleFileTypes = ['.js', '.ts', '.mjs'];
+    return possibleFileTypes
+        .map(function (type) { return "".concat(hooksFile).concat(type); })
+        .find(function (file) { return fs.existsSync(file); });
+}
+exports.findScriptFile = findScriptFile;
+/** Checks if a Sentry package is already mentioned in the file */
+function hasSentryContent(mod) {
+    var imports = mod.imports.$items.map(function (i) { return i.from; });
+    return !!imports.find(function (i) { return i.startsWith('@sentry/'); });
+}
+exports.hasSentryContent = hasSentryContent;
+//# sourceMappingURL=ast-utils.js.map

package/dist/src/utils/ast-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../src/utils/ast-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AAIzB;;;GAGG;AACH,SAAgB,cAAc,CAAC,SAAiB;IAC9C,IAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACjD,OAAO,iBAAiB;SACrB,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,UAAG,SAAS,SAAG,IAAI,CAAE,EAArB,CAAqB,CAAC;SACpC,IAAI,CAAC,UAAC,IAAI,IAAK,OAAA,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAnB,CAAmB,CAAC,CAAC;AACzC,CAAC;AALD,wCAKC;AAED,kEAAkE;AAClE,SAAgB,gBAAgB,CAAC,GAA4B;IAC3D,IAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC,CAAC;IACtD,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAxB,CAAwB,CAAC,CAAC;AACzD,CAAC;AAHD,4CAGC","sourcesContent":["import * as fs from 'fs';\n// @ts-ignore - magicast is ESM and TS complains about that. It works though\nimport { ProxifiedModule } from 'magicast';\n\n/**\n * Checks if a JS/TS file where we don't know its concrete file type yet exists\n * and returns the full path to the file with the correct file type.\n */\nexport function findScriptFile(hooksFile: string): string | undefined {\n  const possibleFileTypes = ['.js', '.ts', '.mjs'];\n  return possibleFileTypes\n    .map((type) => `${hooksFile}${type}`)\n    .find((file) => fs.existsSync(file));\n}\n\n/** Checks if a Sentry package is already mentioned in the file */\nexport function hasSentryContent(mod: ProxifiedModule<object>): boolean {\n  const imports = mod.imports.$items.map((i) => i.from);\n  return !!imports.find((i) => i.startsWith('@sentry/'));\n}\n"]}

package/dist/src/utils/debug.d.ts

@@ -0,0 +1,2 @@
+export declare function debug(...args: unknown[]): void;
+export declare function enableDebugLogs(): void;

package/dist/src/utils/debug.js

@@ -0,0 +1,51 @@
+"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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enableDebugLogs = exports.debug = void 0;
+// @ts-ignore - clack is ESM and TS complains about that. It works though
+var clack = __importStar(require("@clack/prompts"));
+var chalk_1 = __importDefault(require("chalk"));
+var Logging_1 = require("../../lib/Helper/Logging");
+var debugEnabled = false;
+function debug() {
+    var args = [];
+    for (var _i = 0; _i < arguments.length; _i++) {
+        args[_i] = arguments[_i];
+    }
+    if (!debugEnabled) {
+        return;
+    }
+    var msg = args.map(function (a) { return (0, Logging_1.prepareMessage)(a); }).join(' ');
+    clack.log.info(chalk_1.default.dim(msg));
+}
+exports.debug = debug;
+function enableDebugLogs() {
+    debugEnabled = true;
+}
+exports.enableDebugLogs = enableDebugLogs;
+//# sourceMappingURL=debug.js.map

package/dist/src/utils/debug.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/utils/debug.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAyE;AACzE,oDAAwC;AACxC,gDAA0B;AAC1B,oDAA0D;AAE1D,IAAI,YAAY,GAAG,KAAK,CAAC;AAEzB,SAAgB,KAAK;IAAC,cAAkB;SAAlB,UAAkB,EAAlB,qBAAkB,EAAlB,IAAkB;QAAlB,yBAAkB;;IACtC,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;KACR;IAED,IAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,IAAA,wBAAc,EAAC,CAAC,CAAC,EAAjB,CAAiB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEzD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACjC,CAAC;AARD,sBAQC;AAED,SAAgB,eAAe;IAC7B,YAAY,GAAG,IAAI,CAAC;AACtB,CAAC;AAFD,0CAEC","sourcesContent":["// @ts-ignore - clack is ESM and TS complains about that. It works though\nimport * as clack from '@clack/prompts';\nimport chalk from 'chalk';\nimport { prepareMessage } from '../../lib/Helper/Logging';\n\nlet debugEnabled = false;\n\nexport function debug(...args: unknown[]) {\n  if (!debugEnabled) {\n    return;\n  }\n\n  const msg = args.map((a) => prepareMessage(a)).join(' ');\n\n  clack.log.info(chalk.dim(msg));\n}\n\nexport function enableDebugLogs() {\n  debugEnabled = true;\n}\n"]}

package/dist/src/utils/string.d.ts

@@ -0,0 +1 @@
+export declare function stripAnsii(str: string): string;

package/dist/src/utils/string.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripAnsii = void 0;
+function stripAnsii(str) {
+    return str.replace(
+    // eslint-disable-next-line no-control-regex
+    /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, '');
+}
+exports.stripAnsii = stripAnsii;
+//# sourceMappingURL=string.js.map

package/dist/src/utils/string.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../src/utils/string.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CAAC,GAAW;IACpC,OAAO,GAAG,CAAC,OAAO;IAChB,4CAA4C;IAC5C,6EAA6E,EAC7E,EAAE,CACH,CAAC;AACJ,CAAC;AAND,gCAMC","sourcesContent":["export function stripAnsii(str: string): string {\n  return str.replace(\n    // eslint-disable-next-line no-control-regex\n    /[\\u001b\\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,\n    '',\n  );\n}\n"]}

package/dist/test/utils/ast-utils.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//@ts-ignore
+var magicast_1 = require("magicast");
+var ast_utils_1 = require("../../src/utils/ast-utils");
+describe('AST utils', function () {
+    describe('hasSentryContent', function () {
+        it("returns true if a '@sentry/' import was found in the parsed module", function () {
+            var code = "\n        import { sentryVitePlugin } from \"@sentry/vite-plugin\";\n        import * as somethingelse from 'gs';\n\n        export default {\n            plugins: [sentryVitePlugin()]\n        }\n      ";
+            expect((0, ast_utils_1.hasSentryContent)((0, magicast_1.parseModule)(code))).toBe(true);
+        });
+        it.each([
+            "\n      import * as somethingelse from 'gs';\n      export default {\n          plugins: []\n      }\n      ",
+            "import * as somethingelse from 'gs';\n       // import { sentryVitePlugin } from \"@sentry/vite-plugin\"\n      export default {\n          plugins: []\n      }\n      ",
+            "import * as thirdPartyVitePlugin from \"vite-plugin-@sentry\"\n      export default {\n        plugins: [thirdPartyVitePlugin()]\n      }\n      ",
+        ])("reutrns false for modules without a valid '@sentry/' import", function (code) {
+            expect((0, ast_utils_1.hasSentryContent)((0, magicast_1.parseModule)(code))).toBe(false);
+        });
+    });
+});
+//# sourceMappingURL=ast-utils.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ast-utils.test.js","sourceRoot":"","sources":["../../../test/utils/ast-utils.test.ts"],"names":[],"mappings":";;AAAA,YAAY;AACZ,qCAAuC;AACvC,uDAA6D;AAE7D,QAAQ,CAAC,WAAW,EAAE;IACpB,QAAQ,CAAC,kBAAkB,EAAE;QAC3B,EAAE,CAAC,oEAAoE,EAAE;YACvE,IAAM,IAAI,GAAG,6MAOZ,CAAC;YAEF,MAAM,CAAC,IAAA,4BAAgB,EAAC,IAAA,sBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,IAAI,CAAC;YACN,8GAKC;YACD,0KAKC;YACD,mJAIC;SACF,CAAC,CACA,6DAA6D,EAC7D,UAAC,IAAI;YACH,MAAM,CAAC,IAAA,4BAAgB,EAAC,IAAA,sBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["//@ts-ignore\nimport { parseModule } from 'magicast';\nimport { hasSentryContent } from '../../src/utils/ast-utils';\n\ndescribe('AST utils', () => {\n  describe('hasSentryContent', () => {\n    it(\"returns true if a '@sentry/' import was found in the parsed module\", () => {\n      const code = `\n        import { sentryVitePlugin } from \"@sentry/vite-plugin\";\n        import * as somethingelse from 'gs';\n\n        export default {\n            plugins: [sentryVitePlugin()]\n        }\n      `;\n\n      expect(hasSentryContent(parseModule(code))).toBe(true);\n    });\n    it.each([\n      `\n      import * as somethingelse from 'gs';\n      export default {\n          plugins: []\n      }\n      `,\n      `import * as somethingelse from 'gs';\n       // import { sentryVitePlugin } from \"@sentry/vite-plugin\"\n      export default {\n          plugins: []\n      }\n      `,\n      `import * as thirdPartyVitePlugin from \"vite-plugin-@sentry\"\n      export default {\n        plugins: [thirdPartyVitePlugin()]\n      }\n      `,\n    ])(\n      \"reutrns false for modules without a valid '@sentry/' import\",\n      (code) => {\n        expect(hasSentryContent(parseModule(code))).toBe(false);\n      },\n    );\n  });\n});\n"]}

package/lib/Helper/Logging.ts

@@ -1,6 +1,6 @@
 import Chalk from 'chalk';
 
-function prepareMessage(msg: unknown): string {
+export function prepareMessage(msg: unknown): string {
   if (typeof msg === 'string') {
     return msg;
   }

package/lib/Setup.ts

@@ -1,4 +1,5 @@
 import * as _ from 'lodash';
+import { enableDebugLogs } from '../src/utils/debug';
 
 import { readEnvironment } from './Helper/Env';
 import { startWizard } from './Helper/Wizard';
@@ -7,6 +8,10 @@ import * as Step from './Steps';
 export async function run(argv: any): Promise<any> {
   const args = { ...argv, ...readEnvironment() };
 
+  if (argv.debug) {
+    enableDebugLogs();
+  }
+
   if (args.uninstall === undefined) {
     args.uninstall = false;
   }

package/lib/Steps/Integrations/ReactNative.ts

@@ -398,7 +398,7 @@ The snippet will create a button that, when tapped, sends a test event to Sentry
             // eslint-disable-next-line no-useless-escape
             '\\"../node_modules/@sentry/cli/bin/sentry-cli react-native xcode $REACT_NATIVE_XCODE\\"',
         ) +
-        '\n/bin/sh ../node_modules/@sentry/react-native/scripts/collect-modules.sh\n';
+        '\n/bin/sh -c "$WITH_ENVIRONMENT ../node_modules/@sentry/react-native/scripts/collect-modules.sh"\n';
       script.shellScript = JSON.stringify(code);
     }
   }
@@ -422,8 +422,12 @@ The snippet will create a button that, when tapped, sends a test event to Sentry
       {
         shellPath: '/bin/sh',
         shellScript: `
+WITH_ENVIRONMENT="../node_modules/react-native/scripts/xcode/with-environment.sh"
+if [ -f "$WITH_ENVIRONMENT" ]; then
+    . "$WITH_ENVIRONMENT"
+fi 
 export SENTRY_PROPERTIES=sentry.properties
-[[ $SENTRY_INCLUDE_NATIVE_SOURCES == "true" ]] && INCLUDE_SOURCES_FLAG="--include-sources" || INCLUDE_SOURCES_FLAG=""
+[ "$SENTRY_INCLUDE_NATIVE_SOURCES" = "true" ] && INCLUDE_SOURCES_FLAG="--include-sources" || INCLUDE_SOURCES_FLAG=""
 ../node_modules/@sentry/cli/bin/sentry-cli debug-files upload "$INCLUDE_SOURCES_FLAG" "$DWARF_DSYM_FOLDER_PATH"
 `,
       },
@@ -509,7 +513,7 @@ export SENTRY_PROPERTIES=sentry.properties
           // remove sentry properties export
           .replace(/^export SENTRY_PROPERTIES=sentry.properties\r?\n/m, '')
           .replace(
-            /^\/bin\/sh ..\/node_modules\/@sentry\/react-native\/scripts\/collect-modules.sh\r?\n/m,
+            /^\/bin\/sh .*?..\/node_modules\/@sentry\/react-native\/scripts\/collect-modules.sh"?\r?\n/m,
             '',
           )
           // unwrap react-native-xcode.sh command.  In case someone replaced it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wizard",
-  "version": "3.8.0",
+  "version": "3.9.1",
   "homepage": "https://github.com/getsentry/sentry-wizard",
   "repository": "https://github.com/getsentry/sentry-wizard",
   "description": "Sentry wizard helping you to configure your project",
@@ -32,7 +32,7 @@
     "glob": "^7.1.3",
     "inquirer": "^6.2.0",
     "lodash": "^4.17.15",
-    "magicast": "^0.2.9",
+    "magicast": "^0.2.10",
     "opn": "^5.4.0",
     "r2": "^2.0.1",
     "read-env": "^1.3.0",
@@ -65,7 +65,7 @@
     "**/xmldom": "^0.6.0"
   },
   "engines": {
-    "node": ">=14.0.0",
+    "node": ">=14.18.0",
     "npm": ">=3.10.7",
     "yarn": ">=1.0.2"
   },
@@ -76,15 +76,15 @@
     "build": "yarn tsc",
     "postbuild": "chmod +x ./dist/bin.js && cp -r scripts/** dist",
     "lint": "yarn lint:prettier && yarn lint:eslint",
-    "lint:prettier": "prettier --check \"{lib,src}/**/*.ts\"",
+    "lint:prettier": "prettier --check \"{lib,src,test}/**/*.ts\"",
     "lint:eslint": "eslint . --cache --format stylish",
     "fix": "yarn fix:eslint && yarn fix:prettier",
-    "fix:prettier": "prettier --write \"{lib,src}/**/*.ts\"",
+    "fix:prettier": "prettier --write \"{lib,src,test}/**/*.ts\"",
     "fix:eslint": "eslint . --format stylish --fix",
     "test": "yarn build && jest",
     "try": "ts-node bin.ts",
     "try:uninstall": "ts-node bin.ts --uninstall",
-    "test:watch": "jest --watch --notify"
+    "test:watch": "jest --watch"
   },
   "jest": {
     "collectCoverage": true,
@@ -114,5 +114,9 @@
     "testEnvironment": "node"
   },
   "author": "Sentry",
-  "license": "MIT"
+  "license": "MIT",
+  "volta": {
+    "node": "14.18.3",
+    "yarn": "1.22.19"
+  }
 }

package/src/apple/xcode-manager.ts

@@ -80,7 +80,10 @@ function addSentrySPM(proj: any): void {
     comment: 'XCRemoteSwiftPackageReference "sentry-cocoa"',
   });
 
-  xcObjects.XCRemoteSwiftPackageReference = {};
+  if (!xcObjects.XCRemoteSwiftPackageReference) {
+    xcObjects.XCRemoteSwiftPackageReference = {};
+  }
+
   xcObjects.XCRemoteSwiftPackageReference[sentrySwiftPackageUUID] = {
     isa: 'XCRemoteSwiftPackageReference',
     repositoryURL: '"https://github.com/getsentry/sentry-cocoa/"',
@@ -92,7 +95,9 @@ function addSentrySPM(proj: any): void {
   xcObjects.XCRemoteSwiftPackageReference[sentrySwiftPackageUUID + '_comment'] =
     'XCRemoteSwiftPackageReference "sentry-cocoa"';
 
-  xcObjects.XCSwiftPackageProductDependency = {};
+  if (!xcObjects.XCSwiftPackageProductDependency) {
+    xcObjects.XCSwiftPackageProductDependency = {};
+  }
   xcObjects.XCSwiftPackageProductDependency[sentrySPMUUID] = {
     isa: 'XCSwiftPackageProductDependency',
     package: sentrySwiftPackageUUID,

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

@@ -174,7 +174,7 @@ async function askShouldAddToBuildCommand(): Promise<boolean> {
         {
           label: 'Yes',
           value: true,
-          hint: 'This will modify your prod build comamnd',
+          hint: 'This will modify your prod build command',
         },
         { label: 'No', value: false },
       ],