@sentry/wizard 3.11.0 → 3.12.0

package/dist/test/sourcemaps/tools/webpack.test.js

@@ -0,0 +1,179 @@
+"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 fs = __importStar(require("fs"));
+var webpack_1 = require("../../../src/sourcemaps/tools/webpack");
+function updateFileContent(content) {
+    fileContent = content;
+}
+var fileContent = '';
+jest.mock('@clack/prompts', function () {
+    return {
+        log: {
+            info: jest.fn(),
+            success: jest.fn(),
+        },
+        select: jest.fn().mockImplementation(function () { return Promise.resolve(true); }),
+        isCancel: jest.fn().mockReturnValue(false),
+    };
+});
+jest
+    .spyOn(fs.promises, 'readFile')
+    .mockImplementation(function () { return Promise.resolve(fileContent); });
+var writeFileSpy = jest
+    .spyOn(fs.promises, 'writeFile')
+    .mockImplementation(function () { return Promise.resolve(void 0); });
+var noSourcemapNoPluginsPojo = "module.exports = {\n  entry: \"./src/index.js\",\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};";
+var noSourcemapNoPluginsPojoResult = "const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nmodule.exports = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};";
+var noSourcemapsNoPluginsId = "const config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};\n\nmodule.exports = config;";
+var noSourcemapsNoPluginsIdResult = "const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};\n\nmodule.exports = config;";
+var hiddenSourcemapNoPluginsId = "const config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"hidden-cheap-source-map\",\n};\n\nmodule.exports = config;\n    ";
+var hiddenSourcemapNoPluginsIdResult = "const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"hidden-source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};\n\nmodule.exports = config;";
+var arbitrarySourcemapNoPluginsId = "\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: getSourcemapSetting(),\n};\n\nmodule.exports = config;\n    ";
+var arbitrarySourcemapNoPluginsIdResult = "const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};\n\nmodule.exports = config;";
+var noSourcemapUndefinedPluginsPojo = "module.exports = {\n  entry: \"./src/index.js\",\n  plugins: undefined,\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};";
+var noSourcemapUndefinedPluginsPojoResult = "const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nmodule.exports = {\n  entry: \"./src/index.js\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })],\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\"\n};";
+var noSourcemapPluginsPojo = "module.exports = {\n  entry: \"./src/index.js\",\n  plugins: [\n    new HtmlWebpackPlugin(),\n    new MiniCssExtractPlugin(),\n  ],\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};";
+var noSourcemapPluginsPojoResult = "const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nmodule.exports = {\n  entry: \"./src/index.js\",\n\n  plugins: [new HtmlWebpackPlugin(), new MiniCssExtractPlugin(), sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })],\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\"\n};";
+describe('modifyWebpackConfig', function () {
+    afterEach(function () {
+        fileContent = '';
+        jest.clearAllMocks();
+    });
+    it.each([
+        [
+            'no sourcemap option, no plugins, object',
+            noSourcemapNoPluginsPojo,
+            noSourcemapNoPluginsPojoResult,
+        ],
+        [
+            'no sourcemap option, no plugins, identifier',
+            noSourcemapsNoPluginsId,
+            noSourcemapsNoPluginsIdResult,
+        ],
+        [
+            'hidden sourcemap option, no plugins, identifier',
+            hiddenSourcemapNoPluginsId,
+            hiddenSourcemapNoPluginsIdResult,
+        ],
+        [
+            'arbitrary sourcemap option, no plugins, identifier',
+            arbitrarySourcemapNoPluginsId,
+            arbitrarySourcemapNoPluginsIdResult,
+        ],
+        [
+            'no sourcemap option, plugins, object',
+            noSourcemapUndefinedPluginsPojo,
+            noSourcemapUndefinedPluginsPojoResult,
+        ],
+        [
+            'no sourcemap option, plugins, object',
+            noSourcemapPluginsPojo,
+            noSourcemapPluginsPojoResult,
+        ],
+    ])('adds plugin and source maps emission to the webpack config (%s)', function (_, originalCode, expectedCode) { return __awaiter(void 0, void 0, void 0, function () {
+        var addedCode, _a, fileContent;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    updateFileContent(originalCode);
+                    return [4 /*yield*/, (0, webpack_1.modifyWebpackConfig)('', {
+                            authToken: '',
+                            orgSlug: 'my-org',
+                            projectSlug: 'my-project',
+                            selfHosted: false,
+                            url: 'https://sentry.io/',
+                        })];
+                case 1:
+                    addedCode = _b.sent();
+                    expect(writeFileSpy).toHaveBeenCalledTimes(1);
+                    _a = writeFileSpy.mock.calls[0], fileContent = _a[1];
+                    expect(fileContent).toBe(expectedCode);
+                    expect(addedCode).toBe(true);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('adds the url parameter to the webpack plugin options if self-hosted', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var addedCode, _a, fileContent;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    updateFileContent(noSourcemapNoPluginsPojo);
+                    return [4 /*yield*/, (0, webpack_1.modifyWebpackConfig)('', {
+                            authToken: '',
+                            orgSlug: 'my-org',
+                            projectSlug: 'my-project',
+                            selfHosted: true,
+                            url: 'https://santry.io/',
+                        })];
+                case 1:
+                    addedCode = _b.sent();
+                    expect(writeFileSpy).toHaveBeenCalledTimes(1);
+                    _a = writeFileSpy.mock.calls[0], fileContent = _a[1];
+                    expect(fileContent).toContain('url: "https://santry.io/"');
+                    expect(addedCode).toBe(true);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});
+//# sourceMappingURL=webpack.test.js.map

package/dist/test/sourcemaps/tools/webpack.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webpack.test.js","sourceRoot":"","sources":["../../../../test/sourcemaps/tools/webpack.test.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs';\n\nimport { modifyWebpackConfig } from '../../../src/sourcemaps/tools/webpack';\n\nfunction updateFileContent(content: string): void {\n  fileContent = content;\n}\n\nlet fileContent = '';\n\njest.mock('@clack/prompts', () => {\n  return {\n    log: {\n      info: jest.fn(),\n      success: jest.fn(),\n    },\n    select: jest.fn().mockImplementation(() => Promise.resolve(true)),\n    isCancel: jest.fn().mockReturnValue(false),\n  };\n});\n\njest\n  .spyOn(fs.promises, 'readFile')\n  .mockImplementation(() => Promise.resolve(fileContent));\n\nconst writeFileSpy = jest\n  .spyOn(fs.promises, 'writeFile')\n  .mockImplementation(() => Promise.resolve(void 0));\n\nconst noSourcemapNoPluginsPojo = `module.exports = {\n  entry: \"./src/index.js\",\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};`;\n\nconst noSourcemapNoPluginsPojoResult = `const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nmodule.exports = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};`;\n\nconst noSourcemapsNoPluginsId = `const config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};\n\nmodule.exports = config;`;\n\nconst noSourcemapsNoPluginsIdResult = `const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};\n\nmodule.exports = config;`;\n\nconst hiddenSourcemapNoPluginsId = `const config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"hidden-cheap-source-map\",\n};\n\nmodule.exports = config;\n    `;\nconst hiddenSourcemapNoPluginsIdResult = `const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"hidden-source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};\n\nmodule.exports = config;`;\n\nconst arbitrarySourcemapNoPluginsId = `\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: getSourcemapSetting(),\n};\n\nmodule.exports = config;\n    `;\nconst arbitrarySourcemapNoPluginsIdResult = `const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nconst config = {\n  entry: \"./src/index.js\",\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })]\n};\n\nmodule.exports = config;`;\n\nconst noSourcemapUndefinedPluginsPojo = `module.exports = {\n  entry: \"./src/index.js\",\n  plugins: undefined,\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};`;\n\nconst noSourcemapUndefinedPluginsPojoResult = `const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nmodule.exports = {\n  entry: \"./src/index.js\",\n\n  plugins: [sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })],\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\"\n};`;\n\nconst noSourcemapPluginsPojo = `module.exports = {\n  entry: \"./src/index.js\",\n  plugins: [\n    new HtmlWebpackPlugin(),\n    new MiniCssExtractPlugin(),\n  ],\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n};`;\n\nconst noSourcemapPluginsPojoResult = `const {\n  sentryWebpackPlugin\n} = require(\"@sentry/webpack-plugin\");\n\nmodule.exports = {\n  entry: \"./src/index.js\",\n\n  plugins: [new HtmlWebpackPlugin(), new MiniCssExtractPlugin(), sentryWebpackPlugin({\n    authToken: process.env.SENTRY_AUTH_TOKEN,\n    org: \"my-org\",\n    project: \"my-project\"\n  })],\n\n  output: {\n    filename: \"main.js\",\n    path: path.resolve(__dirname, \"build\"),\n  },\n\n  devtool: \"source-map\"\n};`;\n\ndescribe('modifyWebpackConfig', () => {\n  afterEach(() => {\n    fileContent = '';\n    jest.clearAllMocks();\n  });\n\n  it.each([\n    [\n      'no sourcemap option, no plugins, object',\n      noSourcemapNoPluginsPojo,\n      noSourcemapNoPluginsPojoResult,\n    ],\n    [\n      'no sourcemap option, no plugins, identifier',\n      noSourcemapsNoPluginsId,\n      noSourcemapsNoPluginsIdResult,\n    ],\n    [\n      'hidden sourcemap option, no plugins, identifier',\n      hiddenSourcemapNoPluginsId,\n      hiddenSourcemapNoPluginsIdResult,\n    ],\n    [\n      'arbitrary sourcemap option, no plugins, identifier',\n      arbitrarySourcemapNoPluginsId,\n      arbitrarySourcemapNoPluginsIdResult,\n    ],\n    [\n      'no sourcemap option, plugins, object',\n      noSourcemapUndefinedPluginsPojo,\n      noSourcemapUndefinedPluginsPojoResult,\n    ],\n    [\n      'no sourcemap option, plugins, object',\n      noSourcemapPluginsPojo,\n      noSourcemapPluginsPojoResult,\n    ],\n  ])(\n    'adds plugin and source maps emission to the webpack config (%s)',\n    async (_, originalCode, expectedCode) => {\n      updateFileContent(originalCode);\n\n      //   updateFileContent(originalCode);\n      const addedCode = await modifyWebpackConfig('', {\n        authToken: '',\n        orgSlug: 'my-org',\n        projectSlug: 'my-project',\n        selfHosted: false,\n        url: 'https://sentry.io/',\n      });\n\n      expect(writeFileSpy).toHaveBeenCalledTimes(1);\n      const [[, fileContent]] = writeFileSpy.mock.calls;\n      expect(fileContent).toBe(expectedCode);\n      expect(addedCode).toBe(true);\n    },\n  );\n\n  it('adds the url parameter to the webpack plugin options if self-hosted', async () => {\n    updateFileContent(noSourcemapNoPluginsPojo);\n\n    const addedCode = await modifyWebpackConfig('', {\n      authToken: '',\n      orgSlug: 'my-org',\n      projectSlug: 'my-project',\n      selfHosted: true,\n      url: 'https://santry.io/',\n    });\n\n    expect(writeFileSpy).toHaveBeenCalledTimes(1);\n    const [[, fileContent]] = writeFileSpy.mock.calls;\n    expect(fileContent).toContain('url: \"https://santry.io/\"');\n    expect(addedCode).toBe(true);\n  });\n});\n"]}

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

@@ -1,20 +1,55 @@
 "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 });
-//@ts-ignore
-var magicast_1 = require("magicast");
 var ast_utils_1 = require("../../src/utils/ast-utils");
+var recast = __importStar(require("recast"));
 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      const { sentryVitePlugin } = require(\"@sentry/vite-plugin\");\n      const somethingelse = require('gs');\n    ",
+            "\n        import { sentryVitePlugin } from \"@sentry/vite-plugin\";\n        import * as somethingelse from 'gs';\n\n        export default {\n            plugins: [sentryVitePlugin()]\n        }\n      ",
+        ])("returns true if a require('@sentry/') call was found in the parsed module", function (code) {
+            // recast.parse returns a Program node (or fails) but it's badly typed as any
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            var program = recast.parse(code)
+                .program;
+            expect((0, ast_utils_1.hasSentryContent)(program)).toBe(true);
         });
         it.each([
+            "const whatever = require('something')",
+            "// const {sentryWebpackPlugin} = require('@sentry/webpack-plugin')",
+            "const {sAntryWebpackPlugin} = require('webpack-plugin-@sentry')",
             "\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);
+        ])("returns false if the file doesn't contain any require('@sentry/') calls", function (code) {
+            // recast.parse returns a Program node (or fails) but it's badly typed as any
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            var program = recast.parse(code)
+                .program;
+            expect((0, ast_utils_1.hasSentryContent)(program)).toBe(false);
         });
     });
 });

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

@@ -1 +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"]}
+{"version":3,"file":"ast-utils.test.js","sourceRoot":"","sources":["../../../test/utils/ast-utils.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA6D;AAE7D,6CAAiC;AAEjC,QAAQ,CAAC,WAAW,EAAE;IACpB,QAAQ,CAAC,kBAAkB,EAAE;QAC3B,EAAE,CAAC,IAAI,CAAC;YACN,0HAGD;YACC,6MAOC;SACF,CAAC,CACA,2EAA2E,EAC3E,UAAC,IAAI;YACH,6EAA6E;YAC7E,sEAAsE;YACtE,IAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC/B,OAA0C,CAAC;YAC9C,MAAM,CAAC,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC,CACF,CAAC;QAEF,EAAE,CAAC,IAAI,CAAC;YACN,uCAAuC;YACvC,oEAAoE;YACpE,iEAAiE;YACjE,8GAKC;YACD,0KAKC;YACD,mJAIC;SACF,CAAC,CACA,yEAAyE,EACzE,UAAC,IAAI;YACH,6EAA6E;YAC7E,sEAAsE;YACtE,IAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC/B,OAA0C,CAAC;YAC9C,MAAM,CAAC,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { hasSentryContent } from '../../src/utils/ast-utils';\n\nimport * as recast from 'recast';\n\ndescribe('AST utils', () => {\n  describe('hasSentryContent', () => {\n    it.each([\n      `\n      const { sentryVitePlugin } = require(\"@sentry/vite-plugin\");\n      const somethingelse = require('gs');\n    `,\n      `\n        import { sentryVitePlugin } from \"@sentry/vite-plugin\";\n        import * as somethingelse from 'gs';\n\n        export default {\n            plugins: [sentryVitePlugin()]\n        }\n      `,\n    ])(\n      \"returns true if a require('@sentry/') call was found in the parsed module\",\n      (code) => {\n        // recast.parse returns a Program node (or fails) but it's badly typed as any\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        const program = recast.parse(code)\n          .program as recast.types.namedTypes.Program;\n        expect(hasSentryContent(program)).toBe(true);\n      },\n    );\n\n    it.each([\n      `const whatever = require('something')`,\n      `// const {sentryWebpackPlugin} = require('@sentry/webpack-plugin')`,\n      `const {sAntryWebpackPlugin} = require('webpack-plugin-@sentry')`,\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      \"returns false if the file doesn't contain any require('@sentry/') calls\",\n      (code) => {\n        // recast.parse returns a Program node (or fails) but it's badly typed as any\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        const program = recast.parse(code)\n          .program as recast.types.namedTypes.Program;\n        expect(hasSentryContent(program)).toBe(false);\n      },\n    );\n  });\n});\n"]}

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

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

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wizard",
-  "version": "3.11.0",
+  "version": "3.12.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;
   }
@@ -100,6 +102,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 +122,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 +137,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 +158,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 ============

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;