@sentry/wizard 3.23.3 → 3.24.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.24.0
+
+- feat(remix): Switch to OTEL setup (#593)
+- feat(remix): Update `start` script for built-in Remix servers (#604)
+- deps: Bump glob to `10.4.2` (#599)
+
 ## 3.23.3
 
 - fix(nextjs): Fix Types of GlobalError (#592)
@@ -12,12 +18,14 @@
 
 ## 3.23.1
 
-- fix(nextjs): Replace `url` with `sentryUrl` in `withSentryConfig` options (#579)
+- fix(nextjs): Replace `url` with `sentryUrl` in `withSentryConfig` options
+  (#579)
 
 ## 3.23.0
 
 - feat(apple): Disable build script sandboxing (#574)
-- feat(reactnative): Added comment to add spotlight in Sentry.init for React Native config (#548)
+- feat(reactnative): Added comment to add spotlight in Sentry.init for React
+  Native config (#548)
 - feat(reactnative): Added `withSentryConfig` Metro patch (#575)
 
 ## 3.22.3

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sentry/wizard",
-    "version": "3.23.3",
+    "version": "3.24.0",
     "homepage": "https://github.com/getsentry/sentry-wizard",
     "repository": "https://github.com/getsentry/sentry-wizard",
     "description": "Sentry wizard helping you to configure your project",
@@ -29,7 +29,7 @@
         "@sentry/node": "^7.69.0",
         "axios": "1.6.0",
         "chalk": "^2.4.1",
-        "glob": "^7.1.3",
+        "glob": "^8.1.0",
         "inquirer": "^6.2.0",
         "lodash": "^4.17.15",
         "magicast": "^0.2.10",

package/dist/src/react-native/glob.js

@@ -1,15 +1,35 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+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.getFirstMatchedPath = exports.APP_BUILD_GRADLE = exports.XCODE_PROJECT = void 0;
-var glob_1 = __importDefault(require("glob"));
+var glob = __importStar(require("glob"));
 exports.XCODE_PROJECT = 'ios/*.xcodeproj/project.pbxproj';
 exports.APP_BUILD_GRADLE = '**/app/build.gradle';
 var IGNORE_PATTERNS = ['node_modules/**', 'ios/Pods/**', '**/Pods/**'];
 function getFirstMatchedPath(pattern) {
-    var matches = glob_1.default.sync(pattern, {
+    var matches = glob.sync(pattern, {
         ignore: IGNORE_PATTERNS,
     });
     return matches[0];

package/dist/src/react-native/glob.js.map

@@ -1 +1 @@
-{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../src/react-native/glob.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAwB;AAEX,QAAA,aAAa,GAAG,iCAAiC,CAAC;AAClD,QAAA,gBAAgB,GAAG,qBAAqB,CAAC;AAEtD,IAAM,eAAe,GAAG,CAAC,iBAAiB,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;AACzE,SAAgB,mBAAmB,CAAC,OAAe;IACjD,IAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjC,MAAM,EAAE,eAAe;KACxB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC;AAND,kDAMC","sourcesContent":["import glob from 'glob';\n\nexport const XCODE_PROJECT = 'ios/*.xcodeproj/project.pbxproj';\nexport const APP_BUILD_GRADLE = '**/app/build.gradle';\n\nconst IGNORE_PATTERNS = ['node_modules/**', 'ios/Pods/**', '**/Pods/**'];\nexport function getFirstMatchedPath(pattern: string): string | undefined {\n  const matches = glob.sync(pattern, {\n    ignore: IGNORE_PATTERNS,\n  });\n\n  return matches[0];\n}\n"]}
+{"version":3,"file":"glob.js","sourceRoot":"","sources":["../../../src/react-native/glob.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA6B;AAEhB,QAAA,aAAa,GAAG,iCAAiC,CAAC;AAClD,QAAA,gBAAgB,GAAG,qBAAqB,CAAC;AAEtD,IAAM,eAAe,GAAG,CAAC,iBAAiB,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;AACzE,SAAgB,mBAAmB,CAAC,OAAe;IACjD,IAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;QACjC,MAAM,EAAE,eAAe;KACxB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;AACpB,CAAC;AAND,kDAMC","sourcesContent":["import * as glob from 'glob';\n\nexport const XCODE_PROJECT = 'ios/*.xcodeproj/project.pbxproj';\nexport const APP_BUILD_GRADLE = '**/app/build.gradle';\n\nconst IGNORE_PATTERNS = ['node_modules/**', 'ios/Pods/**', '**/Pods/**'];\nexport function getFirstMatchedPath(pattern: string): string | undefined {\n  const matches = glob.sync(pattern, {\n    ignore: IGNORE_PATTERNS,\n  });\n\n  return matches[0];\n}\n"]}

package/dist/src/remix/codemods/express-server.d.ts

@@ -1,5 +1 @@
-import * as recast from 'recast';
-import { ProxifiedImportItem } from 'magicast';
 export declare function findCustomExpressServerImplementation(): Promise<string | null>;
-export declare function instrumentExpressCreateRequestHandler(expressServerPath: string): Promise<boolean>;
-export declare function wrapCreateRequestHandlerWithSentry(createRequestHandlerImport: ProxifiedImportItem | undefined): recast.types.namedTypes.VariableDeclaration | undefined;

package/dist/src/remix/codemods/express-server.js

@@ -58,19 +58,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapCreateRequestHandlerWithSentry = exports.instrumentExpressCreateRequestHandler = exports.findCustomExpressServerImplementation = void 0;
-// @ts-expect-error - clack is ESM and TS complains about that. It works though
-var prompts_1 = __importDefault(require("@clack/prompts"));
-var chalk_1 = __importDefault(require("chalk"));
-var recast = __importStar(require("recast"));
-var ast_types_1 = require("ast-types");
+exports.findCustomExpressServerImplementation = void 0;
 var magicast_1 = require("magicast");
 var fs = __importStar(require("fs"));
-var utils_1 = require("../utils");
 var ast_utils_1 = require("../../utils/ast-utils");
 // Try to find the Express server implementation that contains `createRequestHandler` from `@remix-run/express`
 function findCustomExpressServerImplementation() {
@@ -118,74 +109,4 @@ function findCustomExpressServerImplementation() {
     });
 }
 exports.findCustomExpressServerImplementation = findCustomExpressServerImplementation;
-// Wrap createRequestHandler with `wrapExpressCreateRequestHandler` from `@sentry/remix`
-function instrumentExpressCreateRequestHandler(expressServerPath) {
-    return __awaiter(this, void 0, void 0, function () {
-        var originalExpressServerMod, createRequestHandlerImport, insertionIndex, createRequestHandlerConst, e_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, magicast_1.loadFile)(expressServerPath)];
-                case 1:
-                    originalExpressServerMod = _a.sent();
-                    if ((0, utils_1.hasSentryContent)((0, magicast_1.generateCode)(originalExpressServerMod.$ast).code, originalExpressServerMod.$code)) {
-                        prompts_1.default.log.warn("Express server in ".concat(chalk_1.default.cyan(expressServerPath), " already has Sentry instrumentation. Skipping."));
-                        return [2 /*return*/, false];
-                    }
-                    originalExpressServerMod.imports.$add({
-                        from: '@sentry/remix',
-                        imported: 'wrapExpressCreateRequestHandler',
-                        local: 'wrapExpressCreateRequestHandler',
-                    });
-                    createRequestHandlerImport = originalExpressServerMod.imports.$items.find(function (imp) {
-                        return imp.from === '@remix-run/express' &&
-                            imp.imported === 'createRequestHandler';
-                    });
-                    (0, ast_types_1.visit)(originalExpressServerMod.$ast, {
-                        visitIdentifier: function (path) {
-                            if (path.value.name === 'createRequestHandler' &&
-                                path.parentPath.value.type === 'CallExpression') {
-                                path.value.name = 'sentryCreateRequestHandler';
-                            }
-                            this.traverse(path);
-                        },
-                    });
-                    insertionIndex = (0, utils_1.getInitCallInsertionIndex)(originalExpressServerMod.$ast);
-                    createRequestHandlerConst = wrapCreateRequestHandlerWithSentry(createRequestHandlerImport);
-                    if (!createRequestHandlerConst) {
-                        // Todo: throw error
-                    }
-                    originalExpressServerMod.$ast.body.splice(insertionIndex, 0, 
-                    // @ts-expect-error - string works here because the AST is proxified by magicast
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                    createRequestHandlerConst);
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, (0, magicast_1.writeFile)(originalExpressServerMod.$ast, expressServerPath)];
-                case 3:
-                    _a.sent();
-                    prompts_1.default.log.info("Successfully instrumented Express server in ".concat(chalk_1.default.cyan(expressServerPath), "."));
-                    return [3 /*break*/, 5];
-                case 4:
-                    e_1 = _a.sent();
-                    prompts_1.default.log.warn("Could not write to Express server in ".concat(chalk_1.default.cyan(expressServerPath), "."));
-                    throw e_1;
-                case 5: return [2 /*return*/, true];
-            }
-        });
-    });
-}
-exports.instrumentExpressCreateRequestHandler = instrumentExpressCreateRequestHandler;
-// Wrap `createRequestHandler` with `wrapExpressCreateRequestHandler` and set const name to `sentryCreateRequestHandler`
-function wrapCreateRequestHandlerWithSentry(createRequestHandlerImport) {
-    if (!createRequestHandlerImport) {
-        return;
-    }
-    var createRequestHandler = createRequestHandlerImport.local;
-    var wrapCreateRequestHandler = recast.types.builders.callExpression(recast.types.builders.identifier('wrapExpressCreateRequestHandler'), [recast.types.builders.identifier(createRequestHandler)]);
-    return recast.types.builders.variableDeclaration('const', [
-        recast.types.builders.variableDeclarator(recast.types.builders.identifier('sentryCreateRequestHandler'), wrapCreateRequestHandler),
-    ]);
-}
-exports.wrapCreateRequestHandlerWithSentry = wrapCreateRequestHandlerWithSentry;
 //# sourceMappingURL=express-server.js.map

package/dist/src/remix/codemods/express-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-server.js","sourceRoot":"","sources":["../../../../src/remix/codemods/express-server.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-expect-error - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\nimport * as recast from 'recast';\nimport { visit } from 'ast-types';\nimport {\n  ProxifiedImportItem,\n  generateCode,\n  loadFile,\n  writeFile,\n  // @ts-expect-error - magicast is ESM and TS complains about that. It works though\n} from 'magicast';\nimport type { Program } from '@babel/types';\nimport * as fs from 'fs';\n\nimport { getInitCallInsertionIndex, hasSentryContent } from '../utils';\nimport { findFile } from '../../utils/ast-utils';\n\n// Try to find the Express server implementation that contains `createRequestHandler` from `@remix-run/express`\nexport async function findCustomExpressServerImplementation() {\n  const possiblePaths = [\n    'server',\n    'server/index',\n    'app/server',\n    'app/server/index',\n  ];\n\n  for (const filePath of possiblePaths) {\n    const filename = findFile(filePath);\n\n    if (!filename) {\n      continue;\n    }\n\n    const fileStat = fs.statSync(filename);\n\n    if (!fileStat.isFile()) {\n      continue;\n    }\n\n    const fileMod = await loadFile(filename);\n    const createRequestHandlerImport = fileMod.imports.$items.find(\n      (imp) =>\n        imp.from === '@remix-run/express' &&\n        imp.imported === 'createRequestHandler',\n    );\n\n    if (createRequestHandlerImport) {\n      return filename;\n    }\n  }\n\n  return null;\n}\n\n// Wrap createRequestHandler with `wrapExpressCreateRequestHandler` from `@sentry/remix`\nexport async function instrumentExpressCreateRequestHandler(\n  expressServerPath: string,\n): Promise<boolean> {\n  const originalExpressServerMod = await loadFile(expressServerPath);\n\n  if (\n    hasSentryContent(\n      generateCode(originalExpressServerMod.$ast).code,\n      originalExpressServerMod.$code,\n    )\n  ) {\n    clack.log.warn(\n      `Express server in ${chalk.cyan(\n        expressServerPath,\n      )} already has Sentry instrumentation. Skipping.`,\n    );\n\n    return false;\n  }\n\n  originalExpressServerMod.imports.$add({\n    from: '@sentry/remix',\n    imported: 'wrapExpressCreateRequestHandler',\n    local: 'wrapExpressCreateRequestHandler',\n  });\n\n  const createRequestHandlerImport =\n    originalExpressServerMod.imports.$items.find(\n      (imp) =>\n        imp.from === '@remix-run/express' &&\n        imp.imported === 'createRequestHandler',\n    );\n\n  visit(originalExpressServerMod.$ast, {\n    visitIdentifier(path) {\n      if (\n        path.value.name === 'createRequestHandler' &&\n        path.parentPath.value.type === 'CallExpression'\n      ) {\n        path.value.name = 'sentryCreateRequestHandler';\n      }\n\n      this.traverse(path);\n    },\n  });\n\n  // Insert the const declaration right after the imports\n  // Where we want to insert the const declaration is the same as where we would want to insert the init call.\n  const insertionIndex = getInitCallInsertionIndex(\n    originalExpressServerMod.$ast as Program,\n  );\n\n  const createRequestHandlerConst = wrapCreateRequestHandlerWithSentry(\n    createRequestHandlerImport,\n  );\n\n  if (!createRequestHandlerConst) {\n    // Todo: throw error\n  }\n\n  (originalExpressServerMod.$ast as Program).body.splice(\n    insertionIndex,\n    0,\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n    createRequestHandlerConst,\n  );\n\n  try {\n    await writeFile(originalExpressServerMod.$ast, expressServerPath);\n\n    clack.log.info(\n      `Successfully instrumented Express server in ${chalk.cyan(\n        expressServerPath,\n      )}.`,\n    );\n  } catch (e) {\n    clack.log.warn(\n      `Could not write to Express server in ${chalk.cyan(expressServerPath)}.`,\n    );\n\n    throw e;\n  }\n\n  return true;\n}\n\n// Wrap `createRequestHandler` with `wrapExpressCreateRequestHandler` and set const name to `sentryCreateRequestHandler`\nexport function wrapCreateRequestHandlerWithSentry(\n  createRequestHandlerImport: ProxifiedImportItem | undefined,\n) {\n  if (!createRequestHandlerImport) {\n    return;\n  }\n\n  const createRequestHandler = createRequestHandlerImport.local;\n\n  const wrapCreateRequestHandler = recast.types.builders.callExpression(\n    recast.types.builders.identifier('wrapExpressCreateRequestHandler'),\n    [recast.types.builders.identifier(createRequestHandler)],\n  );\n\n  return recast.types.builders.variableDeclaration('const', [\n    recast.types.builders.variableDeclarator(\n      recast.types.builders.identifier('sentryCreateRequestHandler'),\n      wrapCreateRequestHandler,\n    ),\n  ]);\n}\n"]}
+{"version":3,"file":"express-server.js","sourceRoot":"","sources":["../../../../src/remix/codemods/express-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAGkB;AAClB,qCAAyB;AAEzB,mDAAiD;AAEjD,+GAA+G;AAC/G,SAAsB,qCAAqC;;;;;;oBACnD,aAAa,GAAG;wBACpB,QAAQ;wBACR,cAAc;wBACd,YAAY;wBACZ,kBAAkB;qBACnB,CAAC;0BAEkC,EAAb,+BAAa;;;yBAAb,CAAA,2BAAa,CAAA;oBAAzB,QAAQ;oBACX,QAAQ,GAAG,IAAA,oBAAQ,EAAC,QAAQ,CAAC,CAAC;oBAEpC,IAAI,CAAC,QAAQ,EAAE;wBACb,wBAAS;qBACV;oBAEK,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBAEvC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;wBACtB,wBAAS;qBACV;oBAEe,qBAAM,IAAA,mBAAQ,EAAC,QAAQ,CAAC,EAAA;;oBAAlC,OAAO,GAAG,SAAwB;oBAClC,0BAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAC5D,UAAC,GAAG;wBACF,OAAA,GAAG,CAAC,IAAI,KAAK,oBAAoB;4BACjC,GAAG,CAAC,QAAQ,KAAK,sBAAsB;oBADvC,CACuC,CAC1C,CAAC;oBAEF,IAAI,0BAA0B,EAAE;wBAC9B,sBAAO,QAAQ,EAAC;qBACjB;;;oBAtBoB,IAAa,CAAA;;wBAyBpC,sBAAO,IAAI,EAAC;;;;CACb;AAlCD,sFAkCC","sourcesContent":["import {\n  loadFile,\n  // @ts-expect-error - magicast is ESM and TS complains about that. It works though\n} from 'magicast';\nimport * as fs from 'fs';\n\nimport { findFile } from '../../utils/ast-utils';\n\n// Try to find the Express server implementation that contains `createRequestHandler` from `@remix-run/express`\nexport async function findCustomExpressServerImplementation() {\n  const possiblePaths = [\n    'server',\n    'server/index',\n    'app/server',\n    'app/server/index',\n  ];\n\n  for (const filePath of possiblePaths) {\n    const filename = findFile(filePath);\n\n    if (!filename) {\n      continue;\n    }\n\n    const fileStat = fs.statSync(filename);\n\n    if (!fileStat.isFile()) {\n      continue;\n    }\n\n    const fileMod = await loadFile(filename);\n    const createRequestHandlerImport = fileMod.imports.$items.find(\n      (imp) =>\n        imp.from === '@remix-run/express' &&\n        imp.imported === 'createRequestHandler',\n    );\n\n    if (createRequestHandlerImport) {\n      return filename;\n    }\n  }\n\n  return null;\n}\n"]}

package/dist/src/remix/codemods/handle-error.js

@@ -50,12 +50,12 @@ function instrumentHandleError(originalEntryServerMod, serverEntryFilename) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         var implementation = recast.parse(templates_1.HANDLE_ERROR_TEMPLATE_V2).program
             .body[0];
-        originalEntryServerModAST.body.splice((0, utils_1.getInitCallInsertionIndex)(originalEntryServerModAST), 0, 
+        originalEntryServerModAST.body.splice((0, utils_1.getAfterImportsInsertionIndex)(originalEntryServerModAST), 0, 
         // @ts-expect-error - string works here because the AST is proxified by magicast
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         recast.types.builders.exportNamedDeclaration(implementation));
     }
-    else if ((0, utils_1.hasSentryContent)((0, magicast_1.generateCode)(handleErrorFunction).code, originalEntryServerMod.$code)) {
+    else if ((0, utils_1.hasSentryContent)((0, magicast_1.generateCode)(handleErrorFunction).code, originalEntryServerMod.$code, 'captureRemixServerException')) {
         return false;
     }
     else {

package/dist/src/remix/codemods/handle-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-error.js","sourceRoot":"","sources":["../../../../src/remix/codemods/handle-error.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport type { ProxifiedModule } from 'magicast';\nimport type { Program } from '@babel/types';\n\nimport * as recast from 'recast';\n\nimport { HANDLE_ERROR_TEMPLATE_V2 } from '../templates';\nimport { getInitCallInsertionIndex, hasSentryContent } from '../utils';\n\n// @ts-expect-error - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport { generateCode } from 'magicast';\n\nexport function instrumentHandleError(\n  originalEntryServerMod: ProxifiedModule<any>,\n  serverEntryFilename: string,\n): boolean {\n  const originalEntryServerModAST = originalEntryServerMod.$ast as Program;\n\n  const handleErrorFunction = originalEntryServerModAST.body.find(\n    (node) =>\n      node.type === 'ExportNamedDeclaration' &&\n      node.declaration?.type === 'FunctionDeclaration' &&\n      node.declaration.id?.name === 'handleError',\n  );\n\n  if (!handleErrorFunction) {\n    clack.log.warn(\n      `Could not find function ${chalk.cyan('handleError')} in ${chalk.cyan(\n        serverEntryFilename,\n      )}. Creating one for you.`,\n    );\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    const implementation = recast.parse(HANDLE_ERROR_TEMPLATE_V2).program\n      .body[0];\n\n    originalEntryServerModAST.body.splice(\n      getInitCallInsertionIndex(originalEntryServerModAST),\n      0,\n      // @ts-expect-error - string works here because the AST is proxified by magicast\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n      recast.types.builders.exportNamedDeclaration(implementation),\n    );\n  } else if (\n    hasSentryContent(\n      generateCode(handleErrorFunction).code,\n      originalEntryServerMod.$code,\n    )\n  ) {\n    return false;\n  } else {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    const implementation = recast.parse(HANDLE_ERROR_TEMPLATE_V2).program\n      .body[0];\n\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call\n    handleErrorFunction.declaration.body.body.unshift(\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      recast.parse(HANDLE_ERROR_TEMPLATE_V2).program.body[0].body.body[0],\n    );\n\n    // First parameter is the error\n    //\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    handleErrorFunction.declaration.params[0] = implementation.params[0];\n\n    // Second parameter is the request inside an object\n    // Merging the object properties to make sure it includes request\n    //\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    if (handleErrorFunction.declaration.params?.[1]?.properties) {\n      // @ts-expect-error - string works here because the AST is proxified by magicast\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call\n      handleErrorFunction.declaration.params[1].properties.push(\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        implementation.params[1].properties[0],\n      );\n    } else {\n      // Create second parameter if it doesn't exist\n      //\n      // @ts-expect-error - string works here because the AST is proxified by magicast\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      handleErrorFunction.declaration.params[1] = implementation.params[1];\n    }\n  }\n\n  return true;\n}\n"]}
+{"version":3,"file":"handle-error.js","sourceRoot":"","sources":["../../../../src/remix/codemods/handle-error.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAM5D,6CAAiC;AAEjC,0CAAwD;AACxD,kCAA2E;AAE3E,+EAA+E;AAC/E,2DAAmC;AACnC,gDAA0B;AAE1B,kFAAkF;AAClF,qCAAwC;AAExC,SAAgB,qBAAqB,CACnC,sBAA4C,EAC5C,mBAA2B;;IAE3B,IAAM,yBAAyB,GAAG,sBAAsB,CAAC,IAAe,CAAC;IAEzE,IAAM,mBAAmB,GAAG,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAC7D,UAAC,IAAI;;QACH,OAAA,IAAI,CAAC,IAAI,KAAK,wBAAwB;YACtC,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,MAAK,qBAAqB;YAChD,CAAA,MAAA,IAAI,CAAC,WAAW,CAAC,EAAE,0CAAE,IAAI,MAAK,aAAa,CAAA;KAAA,CAC9C,CAAC;IAEF,IAAI,CAAC,mBAAmB,EAAE;QACxB,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,kCAA2B,eAAK,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAO,eAAK,CAAC,IAAI,CACnE,mBAAmB,CACpB,4BAAyB,CAC3B,CAAC;QAEF,sEAAsE;QACtE,IAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,oCAAwB,CAAC,CAAC,OAAO;aAClE,IAAI,CAAC,CAAC,CAAC,CAAC;QAEX,yBAAyB,CAAC,IAAI,CAAC,MAAM,CACnC,IAAA,qCAA6B,EAAC,yBAAyB,CAAC,EACxD,CAAC;QACD,gFAAgF;QAChF,iEAAiE;QACjE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAC7D,CAAC;KACH;SAAM,IACL,IAAA,wBAAgB,EACd,IAAA,uBAAY,EAAC,mBAAmB,CAAC,CAAC,IAAI,EACtC,sBAAsB,CAAC,KAAK,EAC5B,6BAA6B,CAC9B,EACD;QACA,OAAO,KAAK,CAAC;KACd;SAAM;QACL,sEAAsE;QACtE,IAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,oCAAwB,CAAC,CAAC,OAAO;aAClE,IAAI,CAAC,CAAC,CAAC,CAAC;QAEX,gFAAgF;QAChF,yGAAyG;QACzG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO;QAC/C,sEAAsE;QACtE,MAAM,CAAC,KAAK,CAAC,oCAAwB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CACpE,CAAC;QAEF,+BAA+B;QAC/B,EAAE;QACF,gFAAgF;QAChF,sEAAsE;QACtE,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAErE,mDAAmD;QACnD,iEAAiE;QACjE,EAAE;QACF,gFAAgF;QAChF,sEAAsE;QACtE,IAAI,MAAA,MAAA,mBAAmB,CAAC,WAAW,CAAC,MAAM,0CAAG,CAAC,CAAC,0CAAE,UAAU,EAAE;YAC3D,gFAAgF;YAChF,yGAAyG;YACzG,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI;YACvD,sEAAsE;YACtE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CACvC,CAAC;SACH;aAAM;YACL,8CAA8C;YAC9C,EAAE;YACF,gFAAgF;YAChF,sEAAsE;YACtE,mBAAmB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SACtE;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA/ED,sDA+EC","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport type { ProxifiedModule } from 'magicast';\nimport type { Program } from '@babel/types';\n\nimport * as recast from 'recast';\n\nimport { HANDLE_ERROR_TEMPLATE_V2 } from '../templates';\nimport { getAfterImportsInsertionIndex, hasSentryContent } from '../utils';\n\n// @ts-expect-error - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport { generateCode } from 'magicast';\n\nexport function instrumentHandleError(\n  originalEntryServerMod: ProxifiedModule<any>,\n  serverEntryFilename: string,\n): boolean {\n  const originalEntryServerModAST = originalEntryServerMod.$ast as Program;\n\n  const handleErrorFunction = originalEntryServerModAST.body.find(\n    (node) =>\n      node.type === 'ExportNamedDeclaration' &&\n      node.declaration?.type === 'FunctionDeclaration' &&\n      node.declaration.id?.name === 'handleError',\n  );\n\n  if (!handleErrorFunction) {\n    clack.log.warn(\n      `Could not find function ${chalk.cyan('handleError')} in ${chalk.cyan(\n        serverEntryFilename,\n      )}. Creating one for you.`,\n    );\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    const implementation = recast.parse(HANDLE_ERROR_TEMPLATE_V2).program\n      .body[0];\n\n    originalEntryServerModAST.body.splice(\n      getAfterImportsInsertionIndex(originalEntryServerModAST),\n      0,\n      // @ts-expect-error - string works here because the AST is proxified by magicast\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n      recast.types.builders.exportNamedDeclaration(implementation),\n    );\n  } else if (\n    hasSentryContent(\n      generateCode(handleErrorFunction).code,\n      originalEntryServerMod.$code,\n      'captureRemixServerException',\n    )\n  ) {\n    return false;\n  } else {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    const implementation = recast.parse(HANDLE_ERROR_TEMPLATE_V2).program\n      .body[0];\n\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call\n    handleErrorFunction.declaration.body.body.unshift(\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      recast.parse(HANDLE_ERROR_TEMPLATE_V2).program.body[0].body.body[0],\n    );\n\n    // First parameter is the error\n    //\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    handleErrorFunction.declaration.params[0] = implementation.params[0];\n\n    // Second parameter is the request inside an object\n    // Merging the object properties to make sure it includes request\n    //\n    // @ts-expect-error - string works here because the AST is proxified by magicast\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n    if (handleErrorFunction.declaration.params?.[1]?.properties) {\n      // @ts-expect-error - string works here because the AST is proxified by magicast\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call\n      handleErrorFunction.declaration.params[1].properties.push(\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        implementation.params[1].properties[0],\n      );\n    } else {\n      // Create second parameter if it doesn't exist\n      //\n      // @ts-expect-error - string works here because the AST is proxified by magicast\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      handleErrorFunction.declaration.params[1] = implementation.params[1];\n    }\n  }\n\n  return true;\n}\n"]}

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

@@ -66,7 +66,7 @@ function runRemixWizard(options) {
 exports.runRemixWizard = runRemixWizard;
 function runRemixWizardWithTelemetry(options) {
     return __awaiter(this, void 0, void 0, function () {
-        var remixConfig, packageJson, _a, selectedProject, authToken, sentryUrl, selfHosted, dsn, isTS, isV2, viteConfig, shouldCreateExamplePage;
+        var remixConfig, packageJson, _a, selectedProject, authToken, sentryUrl, selfHosted, dsn, isTS, isV2, viteConfig, instrumentationFile, serverFileInstrumented, shouldCreateExamplePage;
         var _this = this;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -215,19 +215,20 @@ function runRemixWizardWithTelemetry(options) {
                         }); })];
                 case 13:
                     _b.sent();
-                    return [4 /*yield*/, (0, telemetry_1.traceStep)('Initialize Sentry on server entry', function () { return __awaiter(_this, void 0, void 0, function () {
+                    instrumentationFile = '';
+                    return [4 /*yield*/, (0, telemetry_1.traceStep)('Create server instrumentation file', function () { return __awaiter(_this, void 0, void 0, function () {
                             var e_5;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
                                         _a.trys.push([0, 2, , 3]);
-                                        return [4 /*yield*/, (0, sdk_setup_1.initializeSentryOnEntryServer)(dsn, isV2, isTS)];
+                                        return [4 /*yield*/, (0, sdk_setup_1.createServerInstrumentationFile)(dsn)];
                                     case 1:
-                                        _a.sent();
+                                        instrumentationFile = _a.sent();
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_5 = _a.sent();
-                                        prompts_1.default.log.warn("Could not initialize Sentry on server entry.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/");
+                                        prompts_1.default.log.warn('Could not create a server instrumentation file. Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/');
                                         (0, debug_1.debug)(e_5);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
@@ -236,23 +237,20 @@ function runRemixWizardWithTelemetry(options) {
                         }); })];
                 case 14:
                     _b.sent();
-                    return [4 /*yield*/, (0, telemetry_1.traceStep)('Instrument custom Express server', function () { return __awaiter(_this, void 0, void 0, function () {
-                            var hasExpressAdapter, e_6;
+                    serverFileInstrumented = false;
+                    return [4 /*yield*/, (0, telemetry_1.traceStep)('Create server instrumentation file and import it', function () { return __awaiter(_this, void 0, void 0, function () {
+                            var e_6;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
                                         _a.trys.push([0, 2, , 3]);
-                                        hasExpressAdapter = (0, package_json_1.hasPackageInstalled)('@remix-run/express', packageJson);
-                                        if (!hasExpressAdapter) {
-                                            return [2 /*return*/];
-                                        }
-                                        return [4 /*yield*/, (0, sdk_setup_1.instrumentExpressServer)()];
+                                        return [4 /*yield*/, (0, sdk_setup_1.insertServerInstrumentationFile)(dsn)];
                                     case 1:
-                                        _a.sent();
+                                        serverFileInstrumented = _a.sent();
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_6 = _a.sent();
-                                        prompts_1.default.log.warn("Could not instrument custom Express server.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/#custom-express-server");
+                                        prompts_1.default.log.warn('Could not create a server instrumentation file. Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/');
                                         (0, debug_1.debug)(e_6);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
@@ -261,10 +259,55 @@ function runRemixWizardWithTelemetry(options) {
                         }); })];
                 case 15:
                     _b.sent();
-                    return [4 /*yield*/, (0, clack_utils_1.askShouldCreateExamplePage)()];
+                    if (!(!serverFileInstrumented && instrumentationFile)) return [3 /*break*/, 17];
+                    return [4 /*yield*/, (0, telemetry_1.traceStep)('Update `start` script to import instrumentation file.', function () { return __awaiter(_this, void 0, void 0, function () {
+                            var e_7;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, (0, sdk_setup_1.updateStartScript)(instrumentationFile)];
+                                    case 1:
+                                        _a.sent();
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        e_7 = _a.sent();
+                                        prompts_1.default.log
+                                            .warn("Could not automatically add Sentry initialization to server entry.\n    Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/");
+                                        (0, debug_1.debug)(e_7);
+                                        return [3 /*break*/, 3];
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
                 case 16:
+                    _b.sent();
+                    _b.label = 17;
+                case 17: return [4 /*yield*/, (0, telemetry_1.traceStep)('Instrument server `handleError`', function () { return __awaiter(_this, void 0, void 0, function () {
+                        var e_8;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    _a.trys.push([0, 2, , 3]);
+                                    return [4 /*yield*/, (0, sdk_setup_1.instrumentSentryOnEntryServer)(isV2, isTS)];
+                                case 1:
+                                    _a.sent();
+                                    return [3 /*break*/, 3];
+                                case 2:
+                                    e_8 = _a.sent();
+                                    prompts_1.default.log.warn("Could not initialize Sentry on server entry.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/");
+                                    (0, debug_1.debug)(e_8);
+                                    return [3 /*break*/, 3];
+                                case 3: return [2 /*return*/];
+                            }
+                        });
+                    }); })];
+                case 18:
+                    _b.sent();
+                    return [4 /*yield*/, (0, clack_utils_1.askShouldCreateExamplePage)()];
+                case 19:
                     shouldCreateExamplePage = _b.sent();
-                    if (!shouldCreateExamplePage) return [3 /*break*/, 18];
+                    if (!shouldCreateExamplePage) return [3 /*break*/, 21];
                     return [4 /*yield*/, (0, telemetry_1.traceStep)('Create example page', function () { return __awaiter(_this, void 0, void 0, function () {
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -281,10 +324,10 @@ function runRemixWizardWithTelemetry(options) {
                                 }
                             });
                         }); })];
-                case 17:
+                case 20:
                     _b.sent();
-                    _b.label = 18;
-                case 18:
+                    _b.label = 21;
+                case 21:
                     prompts_1.default.outro("\n".concat(chalk_1.default.green('Sentry has been successfully configured for your Remix project.'), "\n\n").concat(chalk_1.default.cyan('You can now deploy your project to see Sentry in action.'), "\n\n").concat(chalk_1.default.cyan("To learn more about how to use Sentry with Remix, visit our documentation:\nhttps://docs.sentry.io/platforms/javascript/guides/remix/")));
                     return [2 /*return*/];
             }

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

@@ -1 +1 @@
-{"version":3,"file":"remix-wizard.js","sourceRoot":"","sources":["../../../src/remix/remix-wizard.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-expect-error - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\n\nimport {\n  addSentryCliConfig,\n  askShouldCreateExamplePage,\n  confirmContinueIfNoOrDirtyGitRepo,\n  ensurePackageIsInstalled,\n  getOrAskForProjectData,\n  getPackageDotJson,\n  installPackage,\n  isUsingTypeScript,\n  printWelcome,\n  rcCliSetupConfig,\n} from '../utils/clack-utils';\nimport { hasPackageInstalled } from '../utils/package-json';\nimport { WizardOptions } from '../utils/types';\nimport {\n  initializeSentryOnEntryClient,\n  initializeSentryOnEntryServer,\n  updateBuildScript,\n  instrumentRootRoute,\n  isRemixV2,\n  loadRemixConfig,\n  runRemixReveal,\n  instrumentExpressServer,\n} from './sdk-setup';\nimport { debug } from '../utils/debug';\nimport { traceStep, withTelemetry } from '../telemetry';\nimport { isHydrogenApp } from './utils';\nimport { DEFAULT_URL } from '../../lib/Constants';\nimport { findFile } from '../utils/ast-utils';\nimport { configureVitePlugin } from '../sourcemaps/tools/vite';\nimport { createExamplePage } from './sdk-example';\n\nexport async function runRemixWizard(options: WizardOptions): Promise<void> {\n  return withTelemetry(\n    {\n      enabled: options.telemetryEnabled,\n      integration: 'remix',\n    },\n    () => runRemixWizardWithTelemetry(options),\n  );\n}\n\nasync function runRemixWizardWithTelemetry(\n  options: WizardOptions,\n): Promise<void> {\n  printWelcome({\n    wizardName: 'Sentry Remix Wizard',\n    promoCode: options.promoCode,\n    telemetryEnabled: options.telemetryEnabled,\n  });\n\n  await confirmContinueIfNoOrDirtyGitRepo();\n\n  const remixConfig = await loadRemixConfig();\n  const packageJson = await getPackageDotJson();\n\n  // We expect `@remix-run/dev` to be installed for every Remix project\n  await ensurePackageIsInstalled(packageJson, '@remix-run/dev', 'Remix');\n\n  const { selectedProject, authToken, sentryUrl, selfHosted } =\n    await getOrAskForProjectData(options, 'javascript-remix');\n\n  await installPackage({\n    packageName: '@sentry/remix',\n    alreadyInstalled: hasPackageInstalled('@sentry/remix', packageJson),\n  });\n\n  const dsn = selectedProject.keys[0].dsn.public;\n\n  const isTS = isUsingTypeScript();\n  const isV2 = isRemixV2(remixConfig, packageJson);\n  const viteConfig = findFile('vite.config');\n\n  await addSentryCliConfig({ authToken }, rcCliSetupConfig);\n\n  if (viteConfig) {\n    await traceStep(\n      'Update vite configuration for sourcemap uploads',\n      async () => {\n        try {\n          await configureVitePlugin({\n            orgSlug: selectedProject.organization.slug,\n            projectSlug: selectedProject.slug,\n            url: sentryUrl,\n            selfHosted,\n            authToken,\n          });\n        } catch (e) {\n          clack.log\n            .warn(`Could not update vite configuration to generate and upload sourcemaps.\n    Please update your vite configuration manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/sourcemaps/`);\n          debug(e);\n        }\n      },\n    );\n  } else {\n    await traceStep('Update build script for sourcemap uploads', async () => {\n      try {\n        await updateBuildScript({\n          org: selectedProject.organization.slug,\n          project: selectedProject.slug,\n          url: sentryUrl === DEFAULT_URL ? undefined : sentryUrl,\n          isHydrogen: isHydrogenApp(packageJson),\n        });\n      } catch (e) {\n        clack.log\n          .warn(`Could not update build script to generate and upload sourcemaps.\n  Please update your build script manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/sourcemaps/`);\n        debug(e);\n      }\n    });\n  }\n\n  await traceStep('Instrument root route', async () => {\n    try {\n      await instrumentRootRoute(isV2, isTS);\n    } catch (e) {\n      clack.log.warn(`Could not instrument root route.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n      debug(e);\n    }\n  });\n\n  traceStep('Reveal missing entry files', () => {\n    try {\n      runRemixReveal(isTS);\n    } catch (e) {\n      clack.log.warn(`Could not run 'npx remix reveal'.\n  Please create your entry files manually`);\n      debug(e);\n    }\n  });\n\n  await traceStep('Initialize Sentry on client entry', async () => {\n    try {\n      await initializeSentryOnEntryClient(dsn, isTS);\n    } catch (e) {\n      clack.log.warn(`Could not initialize Sentry on client entry.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n      debug(e);\n    }\n  });\n\n  await traceStep('Initialize Sentry on server entry', async () => {\n    try {\n      await initializeSentryOnEntryServer(dsn, isV2, isTS);\n    } catch (e) {\n      clack.log.warn(`Could not initialize Sentry on server entry.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n      debug(e);\n    }\n  });\n\n  await traceStep('Instrument custom Express server', async () => {\n    try {\n      const hasExpressAdapter = hasPackageInstalled(\n        '@remix-run/express',\n        packageJson,\n      );\n\n      if (!hasExpressAdapter) {\n        return;\n      }\n\n      await instrumentExpressServer();\n    } catch (e) {\n      clack.log.warn(`Could not instrument custom Express server.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/#custom-express-server`);\n      debug(e);\n    }\n  });\n\n  const shouldCreateExamplePage = await askShouldCreateExamplePage();\n\n  if (shouldCreateExamplePage) {\n    await traceStep('Create example page', async () => {\n      await createExamplePage({\n        isTS,\n        selfHosted,\n        orgSlug: selectedProject.organization.slug,\n        projectId: selectedProject.id,\n        url: sentryUrl,\n      });\n    });\n  }\n\n  clack.outro(`\n${chalk.green(\n  'Sentry has been successfully configured for your Remix project.',\n)}\n\n${chalk.cyan('You can now deploy your project to see Sentry in action.')}\n\n${chalk.cyan(\n  `To learn more about how to use Sentry with Remix, visit our documentation:\nhttps://docs.sentry.io/platforms/javascript/guides/remix/`,\n)}`);\n}\n"]}
+{"version":3,"file":"remix-wizard.js","sourceRoot":"","sources":["../../../src/remix/remix-wizard.ts"],"names":[],"mappings":"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","sourcesContent":["// @ts-expect-error - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\nimport chalk from 'chalk';\n\nimport {\n  addSentryCliConfig,\n  askShouldCreateExamplePage,\n  confirmContinueIfNoOrDirtyGitRepo,\n  ensurePackageIsInstalled,\n  getOrAskForProjectData,\n  getPackageDotJson,\n  installPackage,\n  isUsingTypeScript,\n  printWelcome,\n  rcCliSetupConfig,\n} from '../utils/clack-utils';\nimport { hasPackageInstalled } from '../utils/package-json';\nimport { WizardOptions } from '../utils/types';\nimport {\n  initializeSentryOnEntryClient,\n  instrumentSentryOnEntryServer,\n  updateBuildScript,\n  instrumentRootRoute,\n  isRemixV2,\n  loadRemixConfig,\n  runRemixReveal,\n  insertServerInstrumentationFile,\n  createServerInstrumentationFile,\n  updateStartScript,\n} from './sdk-setup';\nimport { debug } from '../utils/debug';\nimport { traceStep, withTelemetry } from '../telemetry';\nimport { isHydrogenApp } from './utils';\nimport { DEFAULT_URL } from '../../lib/Constants';\nimport { findFile } from '../utils/ast-utils';\nimport { configureVitePlugin } from '../sourcemaps/tools/vite';\nimport { createExamplePage } from './sdk-example';\n\nexport async function runRemixWizard(options: WizardOptions): Promise<void> {\n  return withTelemetry(\n    {\n      enabled: options.telemetryEnabled,\n      integration: 'remix',\n    },\n    () => runRemixWizardWithTelemetry(options),\n  );\n}\n\nasync function runRemixWizardWithTelemetry(\n  options: WizardOptions,\n): Promise<void> {\n  printWelcome({\n    wizardName: 'Sentry Remix Wizard',\n    promoCode: options.promoCode,\n    telemetryEnabled: options.telemetryEnabled,\n  });\n\n  await confirmContinueIfNoOrDirtyGitRepo();\n\n  const remixConfig = await loadRemixConfig();\n  const packageJson = await getPackageDotJson();\n\n  // We expect `@remix-run/dev` to be installed for every Remix project\n  await ensurePackageIsInstalled(packageJson, '@remix-run/dev', 'Remix');\n\n  const { selectedProject, authToken, sentryUrl, selfHosted } =\n    await getOrAskForProjectData(options, 'javascript-remix');\n\n  await installPackage({\n    packageName: '@sentry/remix',\n    alreadyInstalled: hasPackageInstalled('@sentry/remix', packageJson),\n  });\n\n  const dsn = selectedProject.keys[0].dsn.public;\n\n  const isTS = isUsingTypeScript();\n  const isV2 = isRemixV2(remixConfig, packageJson);\n  const viteConfig = findFile('vite.config');\n\n  await addSentryCliConfig({ authToken }, rcCliSetupConfig);\n\n  if (viteConfig) {\n    await traceStep(\n      'Update vite configuration for sourcemap uploads',\n      async () => {\n        try {\n          await configureVitePlugin({\n            orgSlug: selectedProject.organization.slug,\n            projectSlug: selectedProject.slug,\n            url: sentryUrl,\n            selfHosted,\n            authToken,\n          });\n        } catch (e) {\n          clack.log\n            .warn(`Could not update vite configuration to generate and upload sourcemaps.\n    Please update your vite configuration manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/sourcemaps/`);\n          debug(e);\n        }\n      },\n    );\n  } else {\n    await traceStep('Update build script for sourcemap uploads', async () => {\n      try {\n        await updateBuildScript({\n          org: selectedProject.organization.slug,\n          project: selectedProject.slug,\n          url: sentryUrl === DEFAULT_URL ? undefined : sentryUrl,\n          isHydrogen: isHydrogenApp(packageJson),\n        });\n      } catch (e) {\n        clack.log\n          .warn(`Could not update build script to generate and upload sourcemaps.\n  Please update your build script manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/sourcemaps/`);\n        debug(e);\n      }\n    });\n  }\n\n  await traceStep('Instrument root route', async () => {\n    try {\n      await instrumentRootRoute(isV2, isTS);\n    } catch (e) {\n      clack.log.warn(`Could not instrument root route.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n      debug(e);\n    }\n  });\n\n  traceStep('Reveal missing entry files', () => {\n    try {\n      runRemixReveal(isTS);\n    } catch (e) {\n      clack.log.warn(`Could not run 'npx remix reveal'.\n  Please create your entry files manually`);\n      debug(e);\n    }\n  });\n\n  await traceStep('Initialize Sentry on client entry', async () => {\n    try {\n      await initializeSentryOnEntryClient(dsn, isTS);\n    } catch (e) {\n      clack.log.warn(`Could not initialize Sentry on client entry.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n      debug(e);\n    }\n  });\n\n  let instrumentationFile = '';\n\n  await traceStep('Create server instrumentation file', async () => {\n    try {\n      instrumentationFile = await createServerInstrumentationFile(dsn);\n    } catch (e) {\n      clack.log.warn(\n        'Could not create a server instrumentation file. Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/',\n      );\n      debug(e);\n    }\n  });\n\n  let serverFileInstrumented = false;\n\n  await traceStep(\n    'Create server instrumentation file and import it',\n    async () => {\n      try {\n        serverFileInstrumented = await insertServerInstrumentationFile(dsn);\n      } catch (e) {\n        clack.log.warn(\n          'Could not create a server instrumentation file. Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/',\n        );\n        debug(e);\n      }\n    },\n  );\n\n  if (!serverFileInstrumented && instrumentationFile) {\n    await traceStep(\n      'Update `start` script to import instrumentation file.',\n      async () => {\n        try {\n          await updateStartScript(instrumentationFile);\n        } catch (e) {\n          clack.log\n            .warn(`Could not automatically add Sentry initialization to server entry.\n    Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n          debug(e);\n        }\n      },\n    );\n  }\n\n  await traceStep('Instrument server `handleError`', async () => {\n    try {\n      await instrumentSentryOnEntryServer(isV2, isTS);\n    } catch (e) {\n      clack.log.warn(`Could not initialize Sentry on server entry.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);\n      debug(e);\n    }\n  });\n\n  const shouldCreateExamplePage = await askShouldCreateExamplePage();\n\n  if (shouldCreateExamplePage) {\n    await traceStep('Create example page', async () => {\n      await createExamplePage({\n        isTS,\n        selfHosted,\n        orgSlug: selectedProject.organization.slug,\n        projectId: selectedProject.id,\n        url: sentryUrl,\n      });\n    });\n  }\n\n  clack.outro(`\n${chalk.green(\n  'Sentry has been successfully configured for your Remix project.',\n)}\n\n${chalk.cyan('You can now deploy your project to see Sentry in action.')}\n\n${chalk.cyan(\n  `To learn more about how to use Sentry with Remix, visit our documentation:\nhttps://docs.sentry.io/platforms/javascript/guides/remix/`,\n)}`);\n}\n"]}

package/dist/src/remix/sdk-example.js

@@ -95,7 +95,7 @@ function getSentryExamplePageContents(options) {
     var issuesPageLink = options.selfHosted
         ? "".concat(options.url, "organizations/").concat(options.orgSlug, "/issues/?project=").concat(options.projectId)
         : "https://".concat(options.orgSlug, ".sentry.io/issues/?project=").concat(options.projectId);
-    return "\nimport * as Sentry from '@sentry/remix';\n\nexport default function SentryExamplePage() {\n    return (\n        <div>\n            <main\n            style={{\n                minHeight: \"100vh\",\n                display: \"flex\",\n                flexDirection: \"column\",\n                justifyContent: \"center\",\n                alignItems: \"center\",\n            }}\n            >\n\n            <h1 style={{ fontSize: \"4rem\", margin: \"14px 0\" }}>\n                {/* biome-ignore lint/a11y/noSvgWithoutTitle: <explanation> */}\n                <svg\n                style={{\n                    height: \"1em\",\n                }}\n                xmlns=\"http://www.w3.org/2000/svg\"\n                viewBox=\"0 0 200 44\"\n                >\n                <path\n                    fill=\"currentColor\"\n                    d=\"M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z\"\n                />\n                </svg>\n            </h1>\n\n            <p>Get started by sending us a sample error:</p>\n\n            <button\n                type=\"button\"\n                style={{\n                padding: \"12px\",\n                cursor: \"pointer\",\n                backgroundColor: \"#AD6CAA\",\n                borderRadius: \"4px\",\n                border: \"none\",\n                color: \"white\",\n                fontSize: \"14px\",\n                margin: \"18px\",\n                }}\n                onClick={() => {\n                    throw new Error(\"Sentry Example Frontend Error\");\n                }}\n            >\n                Throw error!\n            </button>\n\n            <p>\n                Next, look for the error on the{\" \"}\n                <a href=\"".concat(issuesPageLink, "\">Issues Page</a>.\n            </p>\n            <p style={{ marginTop: \"24px\" }}>\n                For more information, see{\" \"}\n                <a href=\"https://docs.sentry.io/platforms/javascript/guides/remix/\">\n                https://docs.sentry.io/platforms/javascript/guides/remix/\n                </a>\n            </p>\n            </main>\n        </div>\n    );\n}\n");
+    return "\nexport default function SentryExamplePage() {\n    return (\n        <div>\n            <main\n            style={{\n                minHeight: \"100vh\",\n                display: \"flex\",\n                flexDirection: \"column\",\n                justifyContent: \"center\",\n                alignItems: \"center\",\n            }}\n            >\n\n            <h1 style={{ fontSize: \"4rem\", margin: \"14px 0\" }}>\n                {/* biome-ignore lint/a11y/noSvgWithoutTitle: <explanation> */}\n                <svg\n                style={{\n                    height: \"1em\",\n                }}\n                xmlns=\"http://www.w3.org/2000/svg\"\n                viewBox=\"0 0 200 44\"\n                >\n                <path\n                    fill=\"currentColor\"\n                    d=\"M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z\"\n                />\n                </svg>\n            </h1>\n\n            <p>Get started by sending us a sample error:</p>\n\n            <button\n                type=\"button\"\n                style={{\n                padding: \"12px\",\n                cursor: \"pointer\",\n                backgroundColor: \"#AD6CAA\",\n                borderRadius: \"4px\",\n                border: \"none\",\n                color: \"white\",\n                fontSize: \"14px\",\n                margin: \"18px\",\n                }}\n                onClick={() => {\n                    throw new Error(\"Sentry Example Frontend Error\");\n                }}\n            >\n                Throw error!\n            </button>\n\n            <p>\n                Next, look for the error on the{\" \"}\n                <a href=\"".concat(issuesPageLink, "\">Issues Page</a>.\n            </p>\n            <p style={{ marginTop: \"24px\" }}>\n                For more information, see{\" \"}\n                <a href=\"https://docs.sentry.io/platforms/javascript/guides/remix/\">\n                https://docs.sentry.io/platforms/javascript/guides/remix/\n                </a>\n            </p>\n            </main>\n        </div>\n    );\n}\n");
 }
 exports.getSentryExamplePageContents = getSentryExamplePageContents;
 //# sourceMappingURL=sdk-example.js.map

package/dist/src/remix/sdk-example.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-example.js","sourceRoot":"","sources":["../../../src/remix/sdk-example.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,yCAA6B;AAC7B,yEAAyE;AACzE,2DAAmC;AAEnC;;GAEG;AACH,SAAsB,iBAAiB,CAAC,OAMvC;;;;;;oBACO,gBAAgB,GAAG,yCACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MACzB,CAAC;oBAEJ,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;wBACnC,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,8DAAuD,IAAI,CAAC,QAAQ,CAClE,gBAAgB,CACjB,2CAAwC,CAC1C,CAAC;wBACF,sBAAO;qBACR;oBAED,qBAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CACzB,gBAAgB,EAChB,4BAA4B,CAAC,OAAO,CAAC,CACtC,EAAA;;oBAHD,SAGC,CAAC;oBAEF,iBAAK,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAkC,gBAAgB,MAAG,CAAC,CAAC;;;;;CACvE;AA1BD,8CA0BC;AAED,SAAgB,4BAA4B,CAAC,OAM5C;IACC,IAAM,cAAc,GAAG,OAAO,CAAC,UAAU;QACvC,CAAC,CAAC,UAAG,OAAO,CAAC,GAAG,2BAAiB,OAAO,CAAC,OAAO,8BAAoB,OAAO,CAAC,SAAS,CAAE;QACvF,CAAC,CAAC,kBAAW,OAAO,CAAC,OAAO,wCAA8B,OAAO,CAAC,SAAS,CAAE,CAAC;IAEhF,OAAO,08FAuDkB,cAAc,0YAYxC,CAAC;AACF,CAAC;AA/ED,oEA+EC","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\n// @ts-ignore - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\n\n/**\n * Creates an example Remix page to test Sentry\n */\nexport async function createExamplePage(options: {\n  selfHosted: boolean;\n  orgSlug: string;\n  projectId: string;\n  url: string;\n  isTS: boolean;\n}) {\n  const exampleRoutePath = `app/routes/sentry-example-page.${\n    options.isTS ? 'ts' : 'js'\n  }x`;\n\n  if (fs.existsSync(exampleRoutePath)) {\n    clack.log.warn(\n      `It seems like a sentry example page already exists (${path.basename(\n        exampleRoutePath,\n      )}). Skipping creation of example route.`,\n    );\n    return;\n  }\n\n  await fs.promises.writeFile(\n    exampleRoutePath,\n    getSentryExamplePageContents(options),\n  );\n\n  clack.log.info(`Created sentry example page at ${exampleRoutePath}.`);\n}\n\nexport function getSentryExamplePageContents(options: {\n  selfHosted: boolean;\n  orgSlug: string;\n  projectId: string;\n  url: string;\n  isTS?: boolean;\n}) {\n  const issuesPageLink = options.selfHosted\n    ? `${options.url}organizations/${options.orgSlug}/issues/?project=${options.projectId}`\n    : `https://${options.orgSlug}.sentry.io/issues/?project=${options.projectId}`;\n\n  return `\nimport * as Sentry from '@sentry/remix';\n\nexport default function SentryExamplePage() {\n    return (\n        <div>\n            <main\n            style={{\n                minHeight: \"100vh\",\n                display: \"flex\",\n                flexDirection: \"column\",\n                justifyContent: \"center\",\n                alignItems: \"center\",\n            }}\n            >\n\n            <h1 style={{ fontSize: \"4rem\", margin: \"14px 0\" }}>\n                {/* biome-ignore lint/a11y/noSvgWithoutTitle: <explanation> */}\n                <svg\n                style={{\n                    height: \"1em\",\n                }}\n                xmlns=\"http://www.w3.org/2000/svg\"\n                viewBox=\"0 0 200 44\"\n                >\n                <path\n                    fill=\"currentColor\"\n                    d=\"M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z\"\n                />\n                </svg>\n            </h1>\n\n            <p>Get started by sending us a sample error:</p>\n\n            <button\n                type=\"button\"\n                style={{\n                padding: \"12px\",\n                cursor: \"pointer\",\n                backgroundColor: \"#AD6CAA\",\n                borderRadius: \"4px\",\n                border: \"none\",\n                color: \"white\",\n                fontSize: \"14px\",\n                margin: \"18px\",\n                }}\n                onClick={() => {\n                    throw new Error(\"Sentry Example Frontend Error\");\n                }}\n            >\n                Throw error!\n            </button>\n\n            <p>\n                Next, look for the error on the{\" \"}\n                <a href=\"${issuesPageLink}\">Issues Page</a>.\n            </p>\n            <p style={{ marginTop: \"24px\" }}>\n                For more information, see{\" \"}\n                <a href=\"https://docs.sentry.io/platforms/javascript/guides/remix/\">\n                https://docs.sentry.io/platforms/javascript/guides/remix/\n                </a>\n            </p>\n            </main>\n        </div>\n    );\n}\n`;\n}\n"]}
+{"version":3,"file":"sdk-example.js","sourceRoot":"","sources":["../../../src/remix/sdk-example.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,yCAA6B;AAC7B,yEAAyE;AACzE,2DAAmC;AAEnC;;GAEG;AACH,SAAsB,iBAAiB,CAAC,OAMvC;;;;;;oBACO,gBAAgB,GAAG,yCACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MACzB,CAAC;oBAEJ,IAAI,EAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;wBACnC,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,8DAAuD,IAAI,CAAC,QAAQ,CAClE,gBAAgB,CACjB,2CAAwC,CAC1C,CAAC;wBACF,sBAAO;qBACR;oBAED,qBAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CACzB,gBAAgB,EAChB,4BAA4B,CAAC,OAAO,CAAC,CACtC,EAAA;;oBAHD,SAGC,CAAC;oBAEF,iBAAK,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAkC,gBAAgB,MAAG,CAAC,CAAC;;;;;CACvE;AA1BD,8CA0BC;AAED,SAAgB,4BAA4B,CAAC,OAM5C;IACC,IAAM,cAAc,GAAG,OAAO,CAAC,UAAU;QACvC,CAAC,CAAC,UAAG,OAAO,CAAC,GAAG,2BAAiB,OAAO,CAAC,OAAO,8BAAoB,OAAO,CAAC,SAAS,CAAE;QACvF,CAAC,CAAC,kBAAW,OAAO,CAAC,OAAO,wCAA8B,OAAO,CAAC,SAAS,CAAE,CAAC;IAEhF,OAAO,85FAqDkB,cAAc,0YAYxC,CAAC;AACF,CAAC;AA7ED,oEA6EC","sourcesContent":["import * as fs from 'fs';\nimport * as path from 'path';\n// @ts-ignore - clack is ESM and TS complains about that. It works though\nimport clack from '@clack/prompts';\n\n/**\n * Creates an example Remix page to test Sentry\n */\nexport async function createExamplePage(options: {\n  selfHosted: boolean;\n  orgSlug: string;\n  projectId: string;\n  url: string;\n  isTS: boolean;\n}) {\n  const exampleRoutePath = `app/routes/sentry-example-page.${\n    options.isTS ? 'ts' : 'js'\n  }x`;\n\n  if (fs.existsSync(exampleRoutePath)) {\n    clack.log.warn(\n      `It seems like a sentry example page already exists (${path.basename(\n        exampleRoutePath,\n      )}). Skipping creation of example route.`,\n    );\n    return;\n  }\n\n  await fs.promises.writeFile(\n    exampleRoutePath,\n    getSentryExamplePageContents(options),\n  );\n\n  clack.log.info(`Created sentry example page at ${exampleRoutePath}.`);\n}\n\nexport function getSentryExamplePageContents(options: {\n  selfHosted: boolean;\n  orgSlug: string;\n  projectId: string;\n  url: string;\n  isTS?: boolean;\n}) {\n  const issuesPageLink = options.selfHosted\n    ? `${options.url}organizations/${options.orgSlug}/issues/?project=${options.projectId}`\n    : `https://${options.orgSlug}.sentry.io/issues/?project=${options.projectId}`;\n\n  return `\nexport default function SentryExamplePage() {\n    return (\n        <div>\n            <main\n            style={{\n                minHeight: \"100vh\",\n                display: \"flex\",\n                flexDirection: \"column\",\n                justifyContent: \"center\",\n                alignItems: \"center\",\n            }}\n            >\n\n            <h1 style={{ fontSize: \"4rem\", margin: \"14px 0\" }}>\n                {/* biome-ignore lint/a11y/noSvgWithoutTitle: <explanation> */}\n                <svg\n                style={{\n                    height: \"1em\",\n                }}\n                xmlns=\"http://www.w3.org/2000/svg\"\n                viewBox=\"0 0 200 44\"\n                >\n                <path\n                    fill=\"currentColor\"\n                    d=\"M124.32,28.28,109.56,9.22h-3.68V34.77h3.73V15.19l15.18,19.58h3.26V9.22h-3.73ZM87.15,23.54h13.23V20.22H87.14V12.53h14.93V9.21H83.34V34.77h18.92V31.45H87.14ZM71.59,20.3h0C66.44,19.06,65,18.08,65,15.7c0-2.14,1.89-3.59,4.71-3.59a12.06,12.06,0,0,1,7.07,2.55l2-2.83a14.1,14.1,0,0,0-9-3c-5.06,0-8.59,3-8.59,7.27,0,4.6,3,6.19,8.46,7.52C74.51,24.74,76,25.78,76,28.11s-2,3.77-5.09,3.77a12.34,12.34,0,0,1-8.3-3.26l-2.25,2.69a15.94,15.94,0,0,0,10.42,3.85c5.48,0,9-2.95,9-7.51C79.75,23.79,77.47,21.72,71.59,20.3ZM195.7,9.22l-7.69,12-7.64-12h-4.46L186,24.67V34.78h3.84V24.55L200,9.22Zm-64.63,3.46h8.37v22.1h3.84V12.68h8.37V9.22H131.08ZM169.41,24.8c3.86-1.07,6-3.77,6-7.63,0-4.91-3.59-8-9.38-8H154.67V34.76h3.8V25.58h6.45l6.48,9.2h4.44l-7-9.82Zm-10.95-2.5V12.6h7.17c3.74,0,5.88,1.77,5.88,4.84s-2.29,4.86-5.84,4.86Z M29,2.26a4.67,4.67,0,0,0-8,0L14.42,13.53A32.21,32.21,0,0,1,32.17,40.19H27.55A27.68,27.68,0,0,0,12.09,17.47L6,28a15.92,15.92,0,0,1,9.23,12.17H4.62A.76.76,0,0,1,4,39.06l2.94-5a10.74,10.74,0,0,0-3.36-1.9l-2.91,5a4.54,4.54,0,0,0,1.69,6.24A4.66,4.66,0,0,0,4.62,44H19.15a19.4,19.4,0,0,0-8-17.31l2.31-4A23.87,23.87,0,0,1,23.76,44H36.07a35.88,35.88,0,0,0-16.41-31.8l4.67-8a.77.77,0,0,1,1.05-.27c.53.29,20.29,34.77,20.66,35.17a.76.76,0,0,1-.68,1.13H40.6q.09,1.91,0,3.81h4.78A4.59,4.59,0,0,0,50,39.43a4.49,4.49,0,0,0-.62-2.28Z\"\n                />\n                </svg>\n            </h1>\n\n            <p>Get started by sending us a sample error:</p>\n\n            <button\n                type=\"button\"\n                style={{\n                padding: \"12px\",\n                cursor: \"pointer\",\n                backgroundColor: \"#AD6CAA\",\n                borderRadius: \"4px\",\n                border: \"none\",\n                color: \"white\",\n                fontSize: \"14px\",\n                margin: \"18px\",\n                }}\n                onClick={() => {\n                    throw new Error(\"Sentry Example Frontend Error\");\n                }}\n            >\n                Throw error!\n            </button>\n\n            <p>\n                Next, look for the error on the{\" \"}\n                <a href=\"${issuesPageLink}\">Issues Page</a>.\n            </p>\n            <p style={{ marginTop: \"24px\" }}>\n                For more information, see{\" \"}\n                <a href=\"https://docs.sentry.io/platforms/javascript/guides/remix/\">\n                https://docs.sentry.io/platforms/javascript/guides/remix/\n                </a>\n            </p>\n            </main>\n        </div>\n    );\n}\n`;\n}\n"]}

package/dist/src/remix/sdk-setup.d.ts

@@ -1,4 +1,4 @@
-import { PackageDotJson } from '../utils/package-json';
+import type { PackageDotJson } from '../utils/package-json';
 export type PartialRemixConfig = {
     unstable_dev?: boolean;
     future?: {
@@ -11,6 +11,8 @@ export type PartialRemixConfig = {
     };
 };
 export declare function runRemixReveal(isTS: boolean): void;
+export declare function createServerInstrumentationFile(dsn: string): Promise<string>;
+export declare function insertServerInstrumentationFile(dsn: string): Promise<boolean>;
 export declare function isRemixV2(remixConfig: PartialRemixConfig, packageJson: PackageDotJson): boolean;
 export declare function loadRemixConfig(): Promise<PartialRemixConfig>;
 export declare function instrumentRootRoute(isV2?: boolean, isTS?: boolean): Promise<void>;
@@ -21,5 +23,5 @@ export declare function updateBuildScript(args: {
     isHydrogen: boolean;
 }): Promise<void>;
 export declare function initializeSentryOnEntryClient(dsn: string, isTS: boolean): Promise<void>;
-export declare function initializeSentryOnEntryServer(dsn: string, isV2: boolean, isTS: boolean): Promise<void>;
-export declare function instrumentExpressServer(): Promise<void>;
+export declare function updateStartScript(instrumentationFile: string): Promise<void>;
+export declare function instrumentSentryOnEntryServer(isV2: boolean, isTS: boolean): Promise<void>;