@sentry/wizard 3.8.0 → 3.9.0

package/src/sveltekit/sveltekit-wizard.ts

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 
 import {
   abort,
+  addSentryCliRc,
   askForProjectSelection,
   askForSelfHosted,
   askForWizardLogin,
@@ -18,8 +19,6 @@ import { WizardOptions } from '../utils/types';
 import { createExamplePage } from './sdk-example';
 import { createOrMergeSvelteKitFiles, loadSvelteConfig } from './sdk-setup';
 
-import { setupCLIConfig } from './sentry-cli-setup';
-
 export async function runSvelteKitWizard(
   options: WizardOptions,
 ): Promise<void> {
@@ -48,14 +47,21 @@ export async function runSvelteKitWizard(
     alreadyInstalled: hasPackageInstalled('@sentry/sveltekit', packageJson),
   });
 
-  await setupCLIConfig(apiKeys.token, selectedProject, sentryUrl);
-
-  const dsn = selectedProject.keys[0].dsn.public;
+  await addSentryCliRc(apiKeys.token);
 
   const svelteConfig = await loadSvelteConfig();
 
   try {
-    await createOrMergeSvelteKitFiles(dsn, svelteConfig);
+    await createOrMergeSvelteKitFiles(
+      {
+        dsn: selectedProject.keys[0].dsn.public,
+        org: selectedProject.organization.slug,
+        project: selectedProject.slug,
+        selfHosted,
+        url: sentryUrl,
+      },
+      svelteConfig,
+    );
   } catch (e: unknown) {
     clack.log.error('Error while setting up the SvelteKit SDK:');
     clack.log.info(

package/src/utils/ast-utils.ts

@@ -0,0 +1,20 @@
+import * as fs from 'fs';
+// @ts-ignore - magicast is ESM and TS complains about that. It works though
+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 function findScriptFile(hooksFile: string): string | undefined {
+  const possibleFileTypes = ['.js', '.ts', '.mjs'];
+  return possibleFileTypes
+    .map((type) => `${hooksFile}${type}`)
+    .find((file) => fs.existsSync(file));
+}
+
+/** Checks if a Sentry package is already mentioned in the file */
+export function hasSentryContent(mod: ProxifiedModule<object>): boolean {
+  const imports = mod.imports.$items.map((i) => i.from);
+  return !!imports.find((i) => i.startsWith('@sentry/'));
+}

package/src/utils/debug.ts

@@ -0,0 +1,20 @@
+// @ts-ignore - clack is ESM and TS complains about that. It works though
+import * as clack from '@clack/prompts';
+import chalk from 'chalk';
+import { prepareMessage } from '../../lib/Helper/Logging';
+
+let debugEnabled = false;
+
+export function debug(...args: unknown[]) {
+  if (!debugEnabled) {
+    return;
+  }
+
+  const msg = args.map((a) => prepareMessage(a)).join(' ');
+
+  clack.log.info(chalk.dim(msg));
+}
+
+export function enableDebugLogs() {
+  debugEnabled = true;
+}

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

@@ -0,0 +1,44 @@
+//@ts-ignore
+import { parseModule } from 'magicast';
+import { hasSentryContent } from '../../src/utils/ast-utils';
+
+describe('AST utils', () => {
+  describe('hasSentryContent', () => {
+    it("returns true if a '@sentry/' import was found in the parsed module", () => {
+      const code = `
+        import { sentryVitePlugin } from "@sentry/vite-plugin";
+        import * as somethingelse from 'gs';
+
+        export default {
+            plugins: [sentryVitePlugin()]
+        }
+      `;
+
+      expect(hasSentryContent(parseModule(code))).toBe(true);
+    });
+    it.each([
+      `
+      import * as somethingelse from 'gs';
+      export default {
+          plugins: []
+      }
+      `,
+      `import * as somethingelse from 'gs';
+       // import { sentryVitePlugin } from "@sentry/vite-plugin"
+      export default {
+          plugins: []
+      }
+      `,
+      `import * as thirdPartyVitePlugin from "vite-plugin-@sentry"
+      export default {
+        plugins: [thirdPartyVitePlugin()]
+      }
+      `,
+    ])(
+      "reutrns false for modules without a valid '@sentry/' import",
+      (code) => {
+        expect(hasSentryContent(parseModule(code))).toBe(false);
+      },
+    );
+  });
+});

package/dist/src/sveltekit/sentry-cli-setup.d.ts

@@ -1,2 +0,0 @@
-import { SentryProjectData } from '../utils/types';
-export declare function setupCLIConfig(authToken: string, selectedProject: SentryProjectData, sentryUrl: string): Promise<void>;

package/dist/src/sveltekit/sentry-cli-setup.js

@@ -1,71 +0,0 @@
-"use strict";
-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 });
-exports.setupCLIConfig = void 0;
-var SentryCli_1 = require("../../lib/Helper/SentryCli");
-function setupCLIConfig(authToken, selectedProject, sentryUrl) {
-    return __awaiter(this, void 0, void 0, function () {
-        var cli, answers, props;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    cli = new SentryCli_1.SentryCli({ url: sentryUrl });
-                    answers = {
-                        config: {
-                            organization: {
-                                slug: selectedProject.organization.slug,
-                            },
-                            project: {
-                                slug: selectedProject.slug,
-                            },
-                            auth: {
-                                token: authToken,
-                            },
-                        },
-                    };
-                    props = cli.convertAnswersToProperties(answers);
-                    return [4 /*yield*/, cli.createSentryCliConfig(props)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.setupCLIConfig = setupCLIConfig;
-//# sourceMappingURL=sentry-cli-setup.js.map

package/dist/src/sveltekit/sentry-cli-setup.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sentry-cli-setup.js","sourceRoot":"","sources":["../../../src/sveltekit/sentry-cli-setup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAAuD;AAGvD,SAAsB,cAAc,CAClC,SAAiB,EACjB,eAAkC,EAClC,SAAiB;;;;;;oBAEX,GAAG,GAAG,IAAI,qBAAS,CAAC,EAAE,GAAG,EAAE,SAAS,EAAU,CAAC,CAAC;oBAEhD,OAAO,GAAG;wBACd,MAAM,EAAE;4BACN,YAAY,EAAE;gCACZ,IAAI,EAAE,eAAe,CAAC,YAAY,CAAC,IAAI;6BACxC;4BACD,OAAO,EAAE;gCACP,IAAI,EAAE,eAAe,CAAC,IAAI;6BAC3B;4BACD,IAAI,EAAE;gCACJ,KAAK,EAAE,SAAS;6BACjB;yBACF;qBACF,CAAC;oBACI,KAAK,GAAG,GAAG,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;oBACtD,qBAAM,GAAG,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAA;;oBAAtC,SAAsC,CAAC;;;;;CACxC;AAtBD,wCAsBC","sourcesContent":["import { Args } from '../../lib/Constants';\nimport { SentryCli } from '../../lib/Helper/SentryCli';\nimport { SentryProjectData } from '../utils/types';\n\nexport async function setupCLIConfig(\n  authToken: string,\n  selectedProject: SentryProjectData,\n  sentryUrl: string,\n): Promise<void> {\n  const cli = new SentryCli({ url: sentryUrl } as Args);\n\n  const answers = {\n    config: {\n      organization: {\n        slug: selectedProject.organization.slug,\n      },\n      project: {\n        slug: selectedProject.slug,\n      },\n      auth: {\n        token: authToken,\n      },\n    },\n  };\n  const props = cli.convertAnswersToProperties(answers);\n  await cli.createSentryCliConfig(props);\n}\n"]}