@sentry/wizard 3.14.1 → 3.15.0

package/CHANGELOG.md

@@ -1,14 +1,22 @@
 # Changelog
 
+## 3.15.0
+
+- feat(remix): Support sourcemap uploads of Hydrogen apps (#474)
+- fix(remix): Use captureRemixServerException inside handleError (#466)
+- fix(remix): Fix `request` arg in `handleError` template (#469)
+- fix(remix): Update documentation links to the new routes (#470)
+- fix(remix): Instrument existing root `ErrorBoundary` (#472)
+
 ## 3.14.1
 
-ref(sveltekit): Add log for successful Vite plugin insertion (#465)
+- ref(sveltekit): Add log for successful Vite plugin insertion (#465)
 
 ## 3.14.0
 
-feat(nextjs): Add telemetry collection to NextJS wizard (#458)
-feat(wizard): Ask for confirmation to continue if git repo is not clean (#462)
-fix(remix): Fix Remix version and TS checks (#464)
+- feat(nextjs): Add telemetry collection to NextJS wizard (#458)
+- feat(wizard): Ask for confirmation to continue if git repo is not clean (#462)
+- fix(remix): Fix Remix version and TS checks (#464)
 
 ## 3.13.0
 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sentry/wizard",
-    "version": "3.14.1",
+    "version": "3.15.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/dist/src/remix/codemods/handle-error.js

@@ -37,6 +37,7 @@ var chalk_1 = __importDefault(require("chalk"));
 // @ts-expect-error - magicast is ESM and TS complains about that. It works though
 var magicast_1 = require("magicast");
 function instrumentHandleError(originalEntryServerMod, serverEntryFilename) {
+    var _a, _b;
     var originalEntryServerModAST = originalEntryServerMod.$ast;
     var handleErrorFunction = originalEntryServerModAST.body.find(function (node) {
         var _a, _b;
@@ -58,11 +59,38 @@ function instrumentHandleError(originalEntryServerMod, serverEntryFilename) {
         return false;
     }
     else {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        var implementation = recast.parse(templates_1.HANDLE_ERROR_TEMPLATE_V2).program
+            .body[0];
         // @ts-expect-error - string works here because the AST is proxified by magicast
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
         handleErrorFunction.declaration.body.body.unshift(
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         recast.parse(templates_1.HANDLE_ERROR_TEMPLATE_V2).program.body[0].body.body[0]);
+        // First parameter is the error
+        //
+        // @ts-expect-error - string works here because the AST is proxified by magicast
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        handleErrorFunction.declaration.params[0] = implementation.params[0];
+        // Second parameter is the request inside an object
+        // Merging the object properties to make sure it includes request
+        //
+        // @ts-expect-error - string works here because the AST is proxified by magicast
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        if ((_b = (_a = handleErrorFunction.declaration.params) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.properties) {
+            // @ts-expect-error - string works here because the AST is proxified by magicast
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+            handleErrorFunction.declaration.params[1].properties.push(
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            implementation.params[1].properties[0]);
+        }
+        else {
+            // Create second parameter if it doesn't exist
+            //
+            // @ts-expect-error - string works here because the AST is proxified by magicast
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            handleErrorFunction.declaration.params[1] = implementation.params[1];
+        }
     }
     return true;
 }

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":";AAAA,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAM5D,6CAAiC;AAEjC,0CAAwD;AACxD,kCAAuE;AAEvE,+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,iCAAyB,EAAC,yBAAyB,CAAC,EACpD,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,CAC7B,EACD;QACA,OAAO,KAAK,CAAC;KACd;SAAM;QACL,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;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAhDD,sDAgDC","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    // @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\n  return true;\n}\n"]}
+{"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"]}

package/dist/src/remix/codemods/root-common.d.ts

@@ -0,0 +1,2 @@
+import { ProxifiedModule } from 'magicast';
+export declare function wrapAppWithSentry(rootRouteAst: ProxifiedModule, rootFileName: string): void;

package/dist/src/remix/codemods/root-common.js

@@ -0,0 +1,70 @@
+"use strict";
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapAppWithSentry = void 0;
+var recast = __importStar(require("recast"));
+// @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"));
+// @ts-expect-error - magicast is ESM and TS complains about that. It works though
+var magicast_1 = require("magicast");
+function wrapAppWithSentry(rootRouteAst, rootFileName) {
+    rootRouteAst.imports.$add({
+        from: '@sentry/remix',
+        imported: 'withSentry',
+        local: 'withSentry',
+    });
+    recast.visit(rootRouteAst.$ast, {
+        visitExportDefaultDeclaration: function (path) {
+            if (path.value.declaration.type === 'FunctionDeclaration') {
+                // Move the function declaration just before the default export
+                path.insertBefore(path.value.declaration);
+                // Get the name of the function to be wrapped
+                var functionName = path.value.declaration.id.name;
+                // Create the wrapped function call
+                var functionCall = recast.types.builders.callExpression(recast.types.builders.identifier('withSentry'), [recast.types.builders.identifier(functionName)]);
+                // Replace the default export with the wrapped function call
+                path.value.declaration = functionCall;
+            }
+            else if (path.value.declaration.type === 'Identifier') {
+                var rootRouteExport = rootRouteAst.exports.default;
+                var expressionToWrap = (0, magicast_1.generateCode)(rootRouteExport.$ast).code;
+                rootRouteAst.exports.default = magicast_1.builders.raw("withSentry(".concat(expressionToWrap, ")"));
+            }
+            else {
+                prompts_1.default.log.warn(chalk_1.default.yellow("Couldn't instrument ".concat(chalk_1.default.bold(rootFileName), " automatically. Wrap your default export with: ").concat(chalk_1.default.dim('withSentry()'), "\n")));
+            }
+            this.traverse(path);
+        },
+    });
+}
+exports.wrapAppWithSentry = wrapAppWithSentry;
+//# sourceMappingURL=root-common.js.map

package/dist/src/remix/codemods/root-common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"root-common.js","sourceRoot":"","sources":["../../../../src/remix/codemods/root-common.ts"],"names":[],"mappings":";AAAA,4DAA4D;AAC5D,+DAA+D;AAC/D,0DAA0D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE1D,6CAAiC;AACjC,+EAA+E;AAC/E,2DAAmC;AACnC,gDAA0B;AAE1B,kFAAkF;AAClF,qCAAmE;AAEnE,SAAgB,iBAAiB,CAC/B,YAA6B,EAC7B,YAAoB;IAEpB,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,IAAI,EAAE,eAAe;QACrB,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE,YAAY;KACpB,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE;QAC9B,6BAA6B,YAAC,IAAI;YAChC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,qBAAqB,EAAE;gBACzD,+DAA+D;gBAC/D,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAE1C,6CAA6C;gBAC7C,IAAM,YAAY,GAAW,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,IAAc,CAAC;gBAEtE,mCAAmC;gBACnC,IAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CACvD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,EAC9C,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CACjD,CAAC;gBAEF,4DAA4D;gBAC5D,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC;aACvC;iBAAM,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,YAAY,EAAE;gBACvD,IAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC;gBAErD,IAAM,gBAAgB,GAAG,IAAA,uBAAY,EAAC,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;gBAEjE,YAAY,CAAC,OAAO,CAAC,OAAO,GAAG,mBAAQ,CAAC,GAAG,CACzC,qBAAc,gBAAgB,MAAG,CAClC,CAAC;aACH;iBAAM;gBACL,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,eAAK,CAAC,MAAM,CACV,8BAAuB,eAAK,CAAC,IAAI,CAC/B,YAAY,CACb,4DAAkD,eAAK,CAAC,GAAG,CAC1D,cAAc,CACf,OAAI,CACN,CACF,CAAC;aACH;YAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAlDD,8CAkDC","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n/* eslint-disable @typescript-eslint/no-unsafe-member-access */\n/* eslint-disable @typescript-eslint/no-unsafe-argument */\n\nimport * as recast from 'recast';\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 { builders, ProxifiedModule, generateCode } from 'magicast';\n\nexport function wrapAppWithSentry(\n  rootRouteAst: ProxifiedModule,\n  rootFileName: string,\n) {\n  rootRouteAst.imports.$add({\n    from: '@sentry/remix',\n    imported: 'withSentry',\n    local: 'withSentry',\n  });\n\n  recast.visit(rootRouteAst.$ast, {\n    visitExportDefaultDeclaration(path) {\n      if (path.value.declaration.type === 'FunctionDeclaration') {\n        // Move the function declaration just before the default export\n        path.insertBefore(path.value.declaration);\n\n        // Get the name of the function to be wrapped\n        const functionName: string = path.value.declaration.id.name as string;\n\n        // Create the wrapped function call\n        const functionCall = recast.types.builders.callExpression(\n          recast.types.builders.identifier('withSentry'),\n          [recast.types.builders.identifier(functionName)],\n        );\n\n        // Replace the default export with the wrapped function call\n        path.value.declaration = functionCall;\n      } else if (path.value.declaration.type === 'Identifier') {\n        const rootRouteExport = rootRouteAst.exports.default;\n\n        const expressionToWrap = generateCode(rootRouteExport.$ast).code;\n\n        rootRouteAst.exports.default = builders.raw(\n          `withSentry(${expressionToWrap})`,\n        );\n      } else {\n        clack.log.warn(\n          chalk.yellow(\n            `Couldn't instrument ${chalk.bold(\n              rootFileName,\n            )} automatically. Wrap your default export with: ${chalk.dim(\n              'withSentry()',\n            )}\\n`,\n          ),\n        );\n      }\n\n      this.traverse(path);\n    },\n  });\n}\n"]}

package/dist/src/remix/codemods/root-v1.js

@@ -64,56 +64,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.instrumentRootRouteV1 = void 0;
-var recast = __importStar(require("recast"));
 var path = __importStar(require("path"));
 // @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"));
 // @ts-expect-error - magicast is ESM and TS complains about that. It works though
 var magicast_1 = require("magicast");
+var root_common_1 = require("./root-common");
 function instrumentRootRouteV1(rootFileName) {
     return __awaiter(this, void 0, void 0, function () {
-        var rootRouteAst_1, e_1;
+        var rootRouteAst, e_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 3, , 4]);
                     return [4 /*yield*/, (0, magicast_1.loadFile)(path.join(process.cwd(), 'app', rootFileName))];
                 case 1:
-                    rootRouteAst_1 = _a.sent();
-                    rootRouteAst_1.imports.$add({
-                        from: '@sentry/remix',
-                        imported: 'withSentry',
-                        local: 'withSentry',
-                    });
-                    recast.visit(rootRouteAst_1.$ast, {
-                        visitExportDefaultDeclaration: function (path) {
-                            /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-                            if (path.value.declaration.type === 'FunctionDeclaration') {
-                                // Move the function declaration just before the default export
-                                path.insertBefore(path.value.declaration);
-                                // Get the name of the function to be wrapped
-                                var functionName = path.value.declaration.id.name;
-                                // Create the wrapped function call
-                                var functionCall = recast.types.builders.callExpression(recast.types.builders.identifier('withSentry'), [recast.types.builders.identifier(functionName)]);
-                                // Replace the default export with the wrapped function call
-                                path.value.declaration = functionCall;
-                            }
-                            else if (path.value.declaration.type === 'Identifier') {
-                                var rootRouteExport = rootRouteAst_1.exports.default;
-                                var expressionToWrap = (0, magicast_1.generateCode)(
-                                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                                rootRouteExport.$ast).code;
-                                rootRouteAst_1.exports.default = magicast_1.builders.raw("withSentry(".concat(expressionToWrap, ")"));
-                            }
-                            else {
-                                prompts_1.default.log.warn(chalk_1.default.yellow("Couldn't instrument ".concat(chalk_1.default.bold(rootFileName), " automatically. Wrap your default export with: ").concat(chalk_1.default.dim('withSentry()'), "\n")));
-                            }
-                            this.traverse(path);
-                            /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-                        },
-                    });
-                    return [4 /*yield*/, (0, magicast_1.writeFile)(rootRouteAst_1.$ast, path.join(process.cwd(), 'app', rootFileName))];
+                    rootRouteAst = _a.sent();
+                    (0, root_common_1.wrapAppWithSentry)(rootRouteAst, rootFileName);
+                    return [4 /*yield*/, (0, magicast_1.writeFile)(rootRouteAst.$ast, path.join(process.cwd(), 'app', rootFileName))];
                 case 2:
                     _a.sent();
                     return [3 /*break*/, 4];

package/dist/src/remix/codemods/root-v1.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-v1.js","sourceRoot":"","sources":["../../../../src/remix/codemods/root-v1.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\nimport * as recast from 'recast';\nimport * as path from 'path';\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 { builders, generateCode, loadFile, writeFile } from 'magicast';\n\nexport async function instrumentRootRouteV1(\n  rootFileName: string,\n): Promise<void> {\n  try {\n    const rootRouteAst = await loadFile(\n      path.join(process.cwd(), 'app', rootFileName),\n    );\n\n    rootRouteAst.imports.$add({\n      from: '@sentry/remix',\n      imported: 'withSentry',\n      local: 'withSentry',\n    });\n\n    recast.visit(rootRouteAst.$ast, {\n      visitExportDefaultDeclaration(path) {\n        /* eslint-disable @typescript-eslint/no-unsafe-member-access */\n        if (path.value.declaration.type === 'FunctionDeclaration') {\n          // Move the function declaration just before the default export\n          path.insertBefore(path.value.declaration);\n\n          // Get the name of the function to be wrapped\n          const functionName: string = path.value.declaration.id.name as string;\n\n          // Create the wrapped function call\n          const functionCall = recast.types.builders.callExpression(\n            recast.types.builders.identifier('withSentry'),\n            [recast.types.builders.identifier(functionName)],\n          );\n\n          // Replace the default export with the wrapped function call\n          path.value.declaration = functionCall;\n        } else if (path.value.declaration.type === 'Identifier') {\n          const rootRouteExport = rootRouteAst.exports.default;\n\n          const expressionToWrap = generateCode(\n            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n            rootRouteExport.$ast,\n          ).code;\n\n          rootRouteAst.exports.default = builders.raw(\n            `withSentry(${expressionToWrap})`,\n          );\n        } else {\n          clack.log.warn(\n            chalk.yellow(\n              `Couldn't instrument ${chalk.bold(\n                rootFileName,\n              )} automatically. Wrap your default export with: ${chalk.dim(\n                'withSentry()',\n              )}\\n`,\n            ),\n          );\n        }\n\n        this.traverse(path);\n        /* eslint-enable @typescript-eslint/no-unsafe-member-access */\n      },\n    });\n\n    await writeFile(\n      rootRouteAst.$ast,\n      path.join(process.cwd(), 'app', rootFileName),\n    );\n  } catch (e: unknown) {\n    // eslint-disable-next-line no-console\n    console.error(e);\n    clack.log.warn(\n      chalk.yellow(\n        `Something went wrong writing to ${chalk.bold(rootFileName)}`,\n      ),\n    );\n    clack.log.info(\n      `Please put the following code snippet into ${chalk.bold(\n        rootFileName,\n      )}: ${chalk.dim('You probably have to clean it up a bit.')}\\n`,\n    );\n  }\n}\n"]}
+{"version":3,"file":"root-v1.js","sourceRoot":"","sources":["../../../../src/remix/codemods/root-v1.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5D,yCAA6B;AAE7B,+EAA+E;AAC/E,2DAAmC;AACnC,gDAA0B;AAE1B,kFAAkF;AAClF,qCAA+C;AAC/C,6CAAkD;AAElD,SAAsB,qBAAqB,CACzC,YAAoB;;;;;;;oBAGG,qBAAM,IAAA,mBAAQ,EACjC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,CAC9C,EAAA;;oBAFK,YAAY,GAAG,SAEpB;oBAED,IAAA,+BAAiB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;oBAE9C,qBAAM,IAAA,oBAAS,EACb,YAAY,CAAC,IAAI,EACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,CAC9C,EAAA;;oBAHD,SAGC,CAAC;;;;oBAEF,sCAAsC;oBACtC,OAAO,CAAC,KAAK,CAAC,GAAC,CAAC,CAAC;oBACjB,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,eAAK,CAAC,MAAM,CACV,0CAAmC,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAE,CAC9D,CACF,CAAC;oBACF,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,qDAA8C,eAAK,CAAC,IAAI,CACtD,YAAY,CACb,eAAK,eAAK,CAAC,GAAG,CAAC,yCAAyC,CAAC,OAAI,CAC/D,CAAC;;;;;;CAEL;AA5BD,sDA4BC","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\nimport * as path from 'path';\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 { loadFile, writeFile } from 'magicast';\nimport { wrapAppWithSentry } from './root-common';\n\nexport async function instrumentRootRouteV1(\n  rootFileName: string,\n): Promise<void> {\n  try {\n    const rootRouteAst = await loadFile(\n      path.join(process.cwd(), 'app', rootFileName),\n    );\n\n    wrapAppWithSentry(rootRouteAst, rootFileName);\n\n    await writeFile(\n      rootRouteAst.$ast,\n      path.join(process.cwd(), 'app', rootFileName),\n    );\n  } catch (e: unknown) {\n    // eslint-disable-next-line no-console\n    console.error(e);\n    clack.log.warn(\n      chalk.yellow(\n        `Something went wrong writing to ${chalk.bold(rootFileName)}`,\n      ),\n    );\n    clack.log.info(\n      `Please put the following code snippet into ${chalk.bold(\n        rootFileName,\n      )}: ${chalk.dim('You probably have to clean it up a bit.')}\\n`,\n    );\n  }\n}\n"]}

package/dist/src/remix/codemods/root-v2.js

@@ -1,5 +1,8 @@
 "use strict";
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -66,6 +69,8 @@ var path = __importStar(require("path"));
 // @ts-expect-error - magicast is ESM and TS complains about that. It works though
 var magicast_1 = require("magicast");
 var templates_1 = require("../templates");
+var utils_1 = require("../utils");
+var root_common_1 = require("./root-common");
 function instrumentRootRouteV2(rootFileName) {
     return __awaiter(this, void 0, void 0, function () {
         var rootRouteAst, exportsAst, namedExports, foundErrorBoundary;
@@ -112,12 +117,56 @@ function instrumentRootRouteV2(rootFileName) {
                         });
                         recast.visit(rootRouteAst.$ast, {
                             visitExportDefaultDeclaration: function (path) {
-                                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                                 var implementation = recast.parse(templates_1.ERROR_BOUNDARY_TEMPLATE_V2).program
                                     .body[0];
-                                path.insertBefore(
-                                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                                recast.types.builders.exportDeclaration(false, implementation));
+                                path.insertBefore(recast.types.builders.exportDeclaration(false, implementation));
+                                this.traverse(path);
+                            },
+                        });
+                        // If there is already a ErrorBoundary export, and it doesn't have Sentry content
+                    }
+                    else if (!(0, utils_1.hasSentryContent)(rootFileName, rootRouteAst.$code)) {
+                        rootRouteAst.imports.$add({
+                            from: '@sentry/remix',
+                            imported: 'captureRemixErrorBoundaryError',
+                            local: 'captureRemixErrorBoundaryError',
+                        });
+                        (0, root_common_1.wrapAppWithSentry)(rootRouteAst, rootFileName);
+                        recast.visit(rootRouteAst.$ast, {
+                            visitExportNamedDeclaration: function (path) {
+                                var _a, _b;
+                                // Find ErrorBoundary export
+                                if (((_b = (_a = path.value.declaration) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.name) === 'ErrorBoundary') {
+                                    var errorBoundaryExport = path.value.declaration;
+                                    var errorIdentifier_1;
+                                    // check if useRouteError is called
+                                    recast.visit(errorBoundaryExport, {
+                                        visitVariableDeclaration: function (path) {
+                                            var variableDeclaration = path.value.declarations[0];
+                                            var initializer = variableDeclaration.init;
+                                            if (initializer.type === 'CallExpression' &&
+                                                initializer.callee.name === 'useRouteError') {
+                                                errorIdentifier_1 = variableDeclaration.id.name;
+                                            }
+                                            this.traverse(path);
+                                        },
+                                    });
+                                    // We don't have an errorIdentifier, which means useRouteError is not called / imported
+                                    // We need to add it and capture the error
+                                    if (!errorIdentifier_1) {
+                                        rootRouteAst.imports.$add({
+                                            from: '@remix-run/react',
+                                            imported: 'useRouteError',
+                                            local: 'useRouteError',
+                                        });
+                                        var useRouteErrorCall = recast.parse("const error = useRouteError();").program.body[0];
+                                        // Insert at the top of ErrorBoundary body
+                                        errorBoundaryExport.body.body.splice(0, 0, useRouteErrorCall);
+                                    }
+                                    var captureErrorCall = recast.parse("captureRemixErrorBoundaryError(error);").program.body[0];
+                                    // Insert just before the the fallback page is returned
+                                    errorBoundaryExport.body.body.splice(errorBoundaryExport.body.body.length - 1, 0, captureErrorCall);
+                                }
                                 this.traverse(path);
                             },
                         });

package/dist/src/remix/codemods/root-v2.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-v2.js","sourceRoot":"","sources":["../../../../src/remix/codemods/root-v2.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5D,6CAAiC;AACjC,yCAA6B;AAI7B,kFAAkF;AAClF,qCAA+C;AAE/C,0CAA0D;AAE1D,SAAsB,qBAAqB,CACzC,YAAoB;;;;;wBAEC,qBAAM,IAAA,mBAAQ,EACjC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,CAC9C,EAAA;;oBAFK,YAAY,GAAG,SAEpB;oBAEK,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,IAAe,CAAC;oBAElD,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,MAAM,CACzC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,IAAI,KAAK,wBAAwB,EAAtC,CAAsC,CACrB,CAAC;oBAE1B,kBAAkB,GAAG,KAAK,CAAC;oBAE/B,YAAY,CAAC,OAAO,CAAC,UAAC,WAAW;;wBAC/B,IAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC;wBAE5C,IAAI,CAAC,WAAW,EAAE;4BAChB,OAAO;yBACR;wBAED,IAAI,WAAW,CAAC,IAAI,KAAK,qBAAqB,EAAE;4BAC9C,IAAI,CAAA,MAAA,WAAW,CAAC,EAAE,0CAAE,IAAI,MAAK,eAAe,EAAE;gCAC5C,kBAAkB,GAAG,IAAI,CAAC;6BAC3B;yBACF;6BAAM,IAAI,WAAW,CAAC,IAAI,KAAK,qBAAqB,EAAE;4BACrD,IAAM,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC;4BAE9C,YAAY,CAAC,OAAO,CAAC,UAAC,WAAW;;gCAC/B,+DAA+D;gCAC/D,IAAI,CAAA,MAAA,WAAW,CAAC,EAAE,0CAAE,IAAI,MAAK,eAAe,EAAE;oCAC5C,kBAAkB,GAAG,IAAI,CAAC;iCAC3B;4BACH,CAAC,CAAC,CAAC;yBACJ;oBACH,CAAC,CAAC,CAAC;oBAEH,IAAI,CAAC,kBAAkB,EAAE;wBACvB,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;4BACxB,IAAI,EAAE,eAAe;4BACrB,QAAQ,EAAE,gCAAgC;4BAC1C,KAAK,EAAE,gCAAgC;yBACxC,CAAC,CAAC;wBAEH,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;4BACxB,IAAI,EAAE,kBAAkB;4BACxB,QAAQ,EAAE,eAAe;4BACzB,KAAK,EAAE,eAAe;yBACvB,CAAC,CAAC;wBAEH,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE;4BAC9B,6BAA6B,YAAC,IAAI;gCAChC,sEAAsE;gCACtE,IAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,sCAA0B,CAAC,CAAC,OAAO;qCACpE,IAAI,CAAC,CAAC,CAAC,CAAC;gCAEX,IAAI,CAAC,YAAY;gCACf,iEAAiE;gCACjE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,KAAK,EAAE,cAAc,CAAC,CAC/D,CAAC;gCAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;4BACtB,CAAC;yBACF,CAAC,CAAC;qBACJ;oBAED,qBAAM,IAAA,oBAAS,EACb,YAAY,CAAC,IAAI,EACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,YAAY,CAAC,CAC9C,EAAA;;oBAHD,SAGC,CAAC;;;;;CACH;AAvED,sDAuEC","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\nimport * as recast from 'recast';\nimport * as path from 'path';\n\nimport type { ExportNamedDeclaration, Program } from '@babel/types';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport { loadFile, writeFile } from 'magicast';\n\nimport { ERROR_BOUNDARY_TEMPLATE_V2 } from '../templates';\n\nexport async function instrumentRootRouteV2(\n  rootFileName: string,\n): Promise<void> {\n  const rootRouteAst = await loadFile(\n    path.join(process.cwd(), 'app', rootFileName),\n  );\n\n  const exportsAst = rootRouteAst.exports.$ast as Program;\n\n  const namedExports = exportsAst.body.filter(\n    (node) => node.type === 'ExportNamedDeclaration',\n  ) as ExportNamedDeclaration[];\n\n  let foundErrorBoundary = false;\n\n  namedExports.forEach((namedExport) => {\n    const declaration = namedExport.declaration;\n\n    if (!declaration) {\n      return;\n    }\n\n    if (declaration.type === 'FunctionDeclaration') {\n      if (declaration.id?.name === 'ErrorBoundary') {\n        foundErrorBoundary = true;\n      }\n    } else if (declaration.type === 'VariableDeclaration') {\n      const declarations = declaration.declarations;\n\n      declarations.forEach((declaration) => {\n        // @ts-expect-error - id should always have a name in this case\n        if (declaration.id?.name === 'ErrorBoundary') {\n          foundErrorBoundary = true;\n        }\n      });\n    }\n  });\n\n  if (!foundErrorBoundary) {\n    rootRouteAst.imports.$add({\n      from: '@sentry/remix',\n      imported: 'captureRemixErrorBoundaryError',\n      local: 'captureRemixErrorBoundaryError',\n    });\n\n    rootRouteAst.imports.$add({\n      from: '@remix-run/react',\n      imported: 'useRouteError',\n      local: 'useRouteError',\n    });\n\n    recast.visit(rootRouteAst.$ast, {\n      visitExportDefaultDeclaration(path) {\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        const implementation = recast.parse(ERROR_BOUNDARY_TEMPLATE_V2).program\n          .body[0];\n\n        path.insertBefore(\n          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n          recast.types.builders.exportDeclaration(false, implementation),\n        );\n\n        this.traverse(path);\n      },\n    });\n  }\n\n  await writeFile(\n    rootRouteAst.$ast,\n    path.join(process.cwd(), 'app', rootFileName),\n  );\n}\n"]}
+{"version":3,"file":"root-v2.js","sourceRoot":"","sources":["../../../../src/remix/codemods/root-v2.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-member-access */\n/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n/* eslint-disable @typescript-eslint/no-unsafe-call */\n/* eslint-disable @typescript-eslint/no-unsafe-argument */\n\nimport * as recast from 'recast';\nimport * as path from 'path';\n\nimport type { ExportNamedDeclaration, Program } from '@babel/types';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport { loadFile, writeFile } from 'magicast';\n\nimport { ERROR_BOUNDARY_TEMPLATE_V2 } from '../templates';\nimport { hasSentryContent } from '../utils';\nimport { wrapAppWithSentry } from './root-common';\n\nexport async function instrumentRootRouteV2(\n  rootFileName: string,\n): Promise<void> {\n  const rootRouteAst = await loadFile(\n    path.join(process.cwd(), 'app', rootFileName),\n  );\n\n  const exportsAst = rootRouteAst.exports.$ast as Program;\n\n  const namedExports = exportsAst.body.filter(\n    (node) => node.type === 'ExportNamedDeclaration',\n  ) as ExportNamedDeclaration[];\n\n  let foundErrorBoundary = false;\n\n  namedExports.forEach((namedExport) => {\n    const declaration = namedExport.declaration;\n\n    if (!declaration) {\n      return;\n    }\n\n    if (declaration.type === 'FunctionDeclaration') {\n      if (declaration.id?.name === 'ErrorBoundary') {\n        foundErrorBoundary = true;\n      }\n    } else if (declaration.type === 'VariableDeclaration') {\n      const declarations = declaration.declarations;\n\n      declarations.forEach((declaration) => {\n        // @ts-expect-error - id should always have a name in this case\n        if (declaration.id?.name === 'ErrorBoundary') {\n          foundErrorBoundary = true;\n        }\n      });\n    }\n  });\n\n  if (!foundErrorBoundary) {\n    rootRouteAst.imports.$add({\n      from: '@sentry/remix',\n      imported: 'captureRemixErrorBoundaryError',\n      local: 'captureRemixErrorBoundaryError',\n    });\n\n    rootRouteAst.imports.$add({\n      from: '@remix-run/react',\n      imported: 'useRouteError',\n      local: 'useRouteError',\n    });\n\n    recast.visit(rootRouteAst.$ast, {\n      visitExportDefaultDeclaration(path) {\n        const implementation = recast.parse(ERROR_BOUNDARY_TEMPLATE_V2).program\n          .body[0];\n\n        path.insertBefore(\n          recast.types.builders.exportDeclaration(false, implementation),\n        );\n\n        this.traverse(path);\n      },\n    });\n    // If there is already a ErrorBoundary export, and it doesn't have Sentry content\n  } else if (!hasSentryContent(rootFileName, rootRouteAst.$code)) {\n    rootRouteAst.imports.$add({\n      from: '@sentry/remix',\n      imported: 'captureRemixErrorBoundaryError',\n      local: 'captureRemixErrorBoundaryError',\n    });\n\n    wrapAppWithSentry(rootRouteAst, rootFileName);\n\n    recast.visit(rootRouteAst.$ast, {\n      visitExportNamedDeclaration(path) {\n        // Find ErrorBoundary export\n        if (path.value.declaration?.id?.name === 'ErrorBoundary') {\n          const errorBoundaryExport = path.value.declaration;\n\n          let errorIdentifier;\n\n          // check if useRouteError is called\n          recast.visit(errorBoundaryExport, {\n            visitVariableDeclaration(path) {\n              const variableDeclaration = path.value.declarations[0];\n              const initializer = variableDeclaration.init;\n\n              if (\n                initializer.type === 'CallExpression' &&\n                initializer.callee.name === 'useRouteError'\n              ) {\n                errorIdentifier = variableDeclaration.id.name;\n              }\n\n              this.traverse(path);\n            },\n          });\n\n          // We don't have an errorIdentifier, which means useRouteError is not called / imported\n          // We need to add it and capture the error\n          if (!errorIdentifier) {\n            rootRouteAst.imports.$add({\n              from: '@remix-run/react',\n              imported: 'useRouteError',\n              local: 'useRouteError',\n            });\n\n            const useRouteErrorCall = recast.parse(\n              `const error = useRouteError();`,\n            ).program.body[0];\n\n            // Insert at the top of ErrorBoundary body\n            errorBoundaryExport.body.body.splice(0, 0, useRouteErrorCall);\n          }\n\n          const captureErrorCall = recast.parse(\n            `captureRemixErrorBoundaryError(error);`,\n          ).program.body[0];\n\n          // Insert just before the the fallback page is returned\n          errorBoundaryExport.body.body.splice(\n            errorBoundaryExport.body.body.length - 1,\n            0,\n            captureErrorCall,\n          );\n        }\n        this.traverse(path);\n      },\n    });\n  }\n\n  await writeFile(\n    rootRouteAst.$ast,\n    path.join(process.cwd(), 'app', rootFileName),\n  );\n}\n"]}

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

@@ -48,6 +48,8 @@ var package_json_1 = require("../utils/package-json");
 var sdk_setup_1 = require("./sdk-setup");
 var debug_1 = require("../utils/debug");
 var telemetry_1 = require("../telemetry");
+var utils_1 = require("./utils");
+var Constants_1 = require("../../lib/Constants");
 function runRemixWizard(options) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
@@ -109,7 +111,8 @@ function runRemixWizardWithTelemetry(options) {
                                         return [4 /*yield*/, (0, sdk_setup_1.updateBuildScript)({
                                                 org: selectedProject.organization.slug,
                                                 project: selectedProject.name,
-                                                url: sentryUrl,
+                                                url: sentryUrl === Constants_1.DEFAULT_URL ? undefined : sentryUrl,
+                                                isHydrogen: (0, utils_1.isHydrogenApp)(packageJson),
                                             })];
                                     case 1:
                                         _a.sent();
@@ -138,7 +141,7 @@ function runRemixWizardWithTelemetry(options) {
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_2 = _a.sent();
-                                        prompts_1.default.log.warn("Could not instrument root route.\n  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/");
+                                        prompts_1.default.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/");
                                         (0, debug_1.debug)(e_2);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
@@ -159,7 +162,7 @@ function runRemixWizardWithTelemetry(options) {
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_3 = _a.sent();
-                                        prompts_1.default.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/");
+                                        prompts_1.default.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/");
                                         (0, debug_1.debug)(e_3);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
@@ -180,7 +183,7 @@ function runRemixWizardWithTelemetry(options) {
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_4 = _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/");
+                                        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_4);
                                         return [3 /*break*/, 3];
                                     case 3: 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  confirmContinueIfNoOrDirtyGitRepo,\n  ensurePackageIsInstalled,\n  getOrAskForProjectData,\n  getPackageDotJson,\n  installPackage,\n  isUsingTypeScript,\n  printWelcome,\n  sourceMapsCliSetupConfig,\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} from './sdk-setup';\nimport { debug } from '../utils/debug';\nimport { traceStep, withTelemetry } from '../telemetry';\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 } =\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\n  await addSentryCliConfig(authToken, sourceMapsCliSetupConfig);\n\n  await traceStep('Update build script for sourcemap uploads', async () => {\n    try {\n      await updateBuildScript({\n        org: selectedProject.organization.slug,\n        project: selectedProject.name,\n        url: sentryUrl,\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  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/`);\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/`);\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/`);\n      debug(e);\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  confirmContinueIfNoOrDirtyGitRepo,\n  ensurePackageIsInstalled,\n  getOrAskForProjectData,\n  getPackageDotJson,\n  installPackage,\n  isUsingTypeScript,\n  printWelcome,\n  sourceMapsCliSetupConfig,\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} from './sdk-setup';\nimport { debug } from '../utils/debug';\nimport { traceStep, withTelemetry } from '../telemetry';\nimport { isHydrogenApp } from './utils';\nimport { DEFAULT_URL } from '../../lib/Constants';\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 } =\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\n  await addSentryCliConfig(authToken, sourceMapsCliSetupConfig);\n\n  await traceStep('Update build script for sourcemap uploads', async () => {\n    try {\n      await updateBuildScript({\n        org: selectedProject.organization.slug,\n        project: selectedProject.name,\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  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  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  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-setup.d.ts

@@ -17,6 +17,7 @@ export declare function updateBuildScript(args: {
     org: string;
     project: string;
     url?: string;
+    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>;

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

@@ -184,7 +184,7 @@ function instrumentRootRoute(isV2, isTS) {
 exports.instrumentRootRoute = instrumentRootRoute;
 function updateBuildScript(args) {
     return __awaiter(this, void 0, void 0, function () {
-        var packageJsonPath, packageJsonString, packageJson;
+        var packageJsonPath, packageJsonString, packageJson, buildCommand, instrumentedBuildCommand;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -196,15 +196,19 @@ function updateBuildScript(args) {
                     if (!packageJson.scripts) {
                         packageJson.scripts = {};
                     }
+                    buildCommand = args.isHydrogen
+                        ? 'shopify hydrogen build'
+                        : 'remix build';
+                    instrumentedBuildCommand = "".concat(buildCommand, " --sourcemap && sentry-upload-sourcemaps --org ").concat(args.org, " --project ").concat(args.project) +
+                        (args.url ? " --url ".concat(args.url) : '') +
+                        (args.isHydrogen ? ' --buildPath ./dist' : '');
                     if (!packageJson.scripts.build) {
-                        packageJson.scripts.build =
-                            "remix build --sourcemap && sentry-upload-sourcemaps --org ".concat(args.org, " --project ").concat(args.project) +
-                                (args.url ? " --url ".concat(args.url) : '');
+                        packageJson.scripts.build = instrumentedBuildCommand;
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
                     }
-                    else if (packageJson.scripts.build.includes('remix build')) {
+                    else if (packageJson.scripts.build.includes(buildCommand)) {
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-                        packageJson.scripts.build = packageJson.scripts.build.replace('remix build', 'remix build --sourcemap && sentry-upload-sourcemaps');
+                        packageJson.scripts.build = packageJson.scripts.build.replace(buildCommand, instrumentedBuildCommand);
                     }
                     return [4 /*yield*/, fs.promises.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2))];
                 case 2:

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

@@ -1 +1 @@
-{"version":3,"file":"sdk-setup.js","sourceRoot":"","sources":["../../../src/remix/sdk-setup.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAO5D,qCAAyB;AACzB,yCAA6B;AAC7B,uCAA2B;AAE3B,+EAA+E;AAC/E,2DAAmC;AACnC,gDAA0B;AAC1B,iCAAyC;AAEzC,kFAAkF;AAClF,qCAAuE;AACvE,sDAA0E;AAC1E,iCAAsE;AACtE,8CAA2D;AAC3D,8CAA2D;AAC3D,wDAAgE;AAchE,IAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,SAAS,oBAAoB,CAC3B,GAAW,EACX,gBAAsC;IAEtC,IAAM,QAAQ,GAAG,mBAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACpD,GAAG,KAAA;QACH,gBAAgB,EAAE,GAAG;QACrB,wBAAwB,EAAE,GAAG;QAC7B,wBAAwB,EAAE,GAAG;QAC7B,YAAY,EAAE;YACZ,mBAAQ,CAAC,aAAa,CAAC,uBAAuB,EAAE;gBAC9C,sBAAsB,EAAE,mBAAQ,CAAC,YAAY,CAC3C,mCAAmC,EACnC,mBAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EACzB,mBAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAC3B,mBAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAC3B;aACF,CAAC;YACF,mBAAQ,CAAC,aAAa,CAAC,eAAe,CAAC;SACxC;KACF,CAAC,CAAC;IAEH,IAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAe,CAAC;IAC7D,IAAM,sBAAsB,GAAG,IAAA,iCAAyB,EAAC,mBAAmB,CAAC,CAAC;IAE9E,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAC7B,sBAAsB,EACtB,CAAC;IACD,gFAAgF;IAChF,iEAAiE;IACjE,IAAA,uBAAY,EAAC,QAAQ,CAAC,CAAC,IAAI,CAC5B,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,GAAW,EACX,gBAAsC;IAEtC,IAAM,QAAQ,GAAG,mBAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACpD,GAAG,KAAA;QACH,gBAAgB,EAAE,GAAG;KACtB,CAAC,CAAC;IAEH,IAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAe,CAAC;IAE7D,IAAM,sBAAsB,GAAG,IAAA,iCAAyB,EAAC,mBAAmB,CAAC,CAAC;IAE9E,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAC7B,sBAAsB,EACtB,CAAC;IACD,gFAAgF;IAChF,iEAAiE;IACjE,IAAA,uBAAY,EAAC,QAAQ,CAAC,CAAC,IAAI,CAC5B,CAAC;AACJ,CAAC;AAED,SAAgB,SAAS,CACvB,WAA+B,EAC/B,WAA2B;;IAE3B,IAAM,YAAY,GAAG,IAAA,gCAAiB,EAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;IACxE,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,KAAK,CAAC;KACd;IAED,IAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,YAAY,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,CAAC;KACd;IAED,IAAM,SAAS,GAAG,IAAA,YAAG,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEvC,OAAO,SAAS,KAAI,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,0CAAE,gBAAgB,CAAA,IAAI,KAAK,CAAC;AACrE,CAAC;AAlBD,8BAkBC;AAED,SAAsB,eAAe;;;;;;oBAC7B,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;;;;oBAGjE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;wBAClC,sBAAO,EAAE,EAAC;qBACX;oBAEK,SAAS,GAAG,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC;oBAC9B,qBAAM,MAAM,CAAC,SAAS,CAAC,EAAA;;oBAA5C,iBAAiB,GAAG,CAAC,SAAuB,CAEjD;oBAED,sBAAO,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,KAAI,EAAE,EAAC;;;oBAExC,iBAAK,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAiB,iBAAiB,MAAG,CAAC,CAAC;oBACvD,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,eAAK,CAAC,GAAG,CACP,OAAO,GAAC,KAAK,QAAQ,IAAI,GAAC,IAAI,IAAI,IAAI,UAAU,IAAI,GAAC;wBACnD,CAAC,CAAC,GAAC,CAAC,QAAQ,EAAE;wBACd,CAAC,CAAC,OAAO,GAAC,KAAK,QAAQ;4BACvB,CAAC,CAAC,GAAC;4BACH,CAAC,CAAC,eAAe,CACpB,CACF,CAAC;oBAEF,sBAAO,EAAE,EAAC;;;;;CAEb;AA5BD,0CA4BC;AAED,SAAsB,mBAAmB,CACvC,IAAc,EACd,IAAc;;;;;;oBAER,YAAY,GAAG,eAAQ,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAE,CAAC;yBAEhD,IAAI,EAAJ,wBAAI;oBACN,qBAAM,IAAA,+BAAqB,EAAC,YAAY,CAAC,EAAA;;oBAAzC,SAAyC,CAAC;;wBAE1C,qBAAM,IAAA,+BAAqB,EAAC,YAAY,CAAC,EAAA;;oBAAzC,SAAyC,CAAC;;;oBAG5C,iBAAK,CAAC,GAAG,CAAC,OAAO,CACf,+CAAwC,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAG,CACpE,CAAC;;;;;CAEH;AAhBD,kDAgBC;AAED,SAAsB,iBAAiB,CAAC,IAIvC;;;;;;oBAGO,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,CAAC;oBAE/D,qBAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAA;;oBADvC,iBAAiB,GAAG,CACxB,SAA2C,CAC5C,CAAC,QAAQ,EAAE;oBACN,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;oBAElD,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;wBACxB,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;qBAC1B;oBAED,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE;wBAC9B,WAAW,CAAC,OAAO,CAAC,KAAK;4BACvB,oEAA6D,IAAI,CAAC,GAAG,wBAAc,IAAI,CAAC,OAAO,CAAE;gCACjG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAU,IAAI,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBAEzC,6DAA6D;qBAC9D;yBAAM,IAAI,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;wBAC5D,6DAA6D;wBAC7D,WAAW,CAAC,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAC3D,aAAa,EACb,qDAAqD,CACtD,CAAC;qBACH;oBAED,qBAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CACzB,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CACrC,EAAA;;oBAHD,SAGC,CAAC;oBAEF,iBAAK,CAAC,GAAG,CAAC,OAAO,CACf,+BAAwB,eAAK,CAAC,IAAI,CAAC,OAAO,CAAC,wBAAc,eAAK,CAAC,IAAI,CACjE,cAAc,CACf,wCAAqC,CACvC,CAAC;;;;;CAEH;AA1CD,8CA0CC;AAED,SAAsB,6BAA6B,CACjD,GAAW,EACX,IAAa;;;;;;oBAEP,mBAAmB,GAAG,uBAAgB,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAE,CAAC;oBAE7D,mBAAmB,GAAG,IAAI,CAAC,IAAI,CACnC,OAAO,CAAC,GAAG,EAAE,EACb,KAAK,EACL,mBAAmB,CACpB,CAAC;oBAE6B,qBAAM,IAAA,mBAAQ,EAAC,mBAAmB,CAAC,EAAA;;oBAA5D,sBAAsB,GAAG,SAAmC;oBAElE,IAAI,IAAA,wBAAgB,EAAC,mBAAmB,EAAE,sBAAsB,CAAC,KAAK,CAAC,EAAE;wBACvE,sBAAO;qBACR;oBAED,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClC,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,QAAQ;qBAChB,CAAC,CAAC;oBAEH,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClC,IAAI,EAAE,OAAO;wBACb,QAAQ,EAAE,WAAW;wBACrB,KAAK,EAAE,WAAW;qBACnB,CAAC,CAAC;oBAEH,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClC,IAAI,EAAE,kBAAkB;wBACxB,QAAQ,EAAE,aAAa;wBACvB,KAAK,EAAE,aAAa;qBACrB,CAAC,CAAC;oBAEH,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClC,IAAI,EAAE,kBAAkB;wBACxB,QAAQ,EAAE,YAAY;wBACtB,KAAK,EAAE,YAAY;qBACpB,CAAC,CAAC;oBAEH,oBAAoB,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;oBAElD,qBAAM,IAAA,oBAAS,EACb,sBAAsB,CAAC,IAAI,EAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,CACrD,EAAA;;oBAHD,SAGC,CAAC;oBAEF,iBAAK,CAAC,GAAG,CAAC,OAAO,CACf,gEAAyD,eAAK,CAAC,IAAI,CACjE,mBAAmB,CACpB,CAAE,CACJ,CAAC;;;;;CACH;AAtDD,sEAsDC;AAED,SAAsB,6BAA6B,CACjD,GAAW,EACX,IAAa,EACb,IAAa;;;;;;oBAEP,mBAAmB,GAAG,uBAAgB,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAE,CAAC;oBAE7D,mBAAmB,GAAG,IAAI,CAAC,IAAI,CACnC,OAAO,CAAC,GAAG,EAAE,EACb,KAAK,EACL,mBAAmB,CACpB,CAAC;oBAE6B,qBAAM,IAAA,mBAAQ,EAAC,mBAAmB,CAAC,EAAA;;oBAA5D,sBAAsB,GAAG,SAAmC;oBAElE,IAAI,IAAA,wBAAgB,EAAC,mBAAmB,EAAE,sBAAsB,CAAC,KAAK,CAAC,EAAE;wBACvE,sBAAO;qBACR;oBAED,sBAAsB,CAAC,OAAO,CAAC,IAAI,CAAC;wBAClC,IAAI,EAAE,eAAe;wBACrB,QAAQ,EAAE,GAAG;wBACb,KAAK,EAAE,QAAQ;qBAChB,CAAC,CAAC;oBAEH,oBAAoB,CAAC,GAAG,EAAE,sBAAsB,CAAC,CAAC;oBAElD,IAAI,IAAI,EAAE;wBACF,uBAAuB,GAAG,IAAA,oCAAqB,EACnD,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;wBAEF,IAAI,uBAAuB,EAAE;4BAC3B,iBAAK,CAAC,GAAG,CAAC,OAAO,CACf,uBAAgB,eAAK,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAO,eAAK,CAAC,IAAI,CACxD,UAAG,mBAAmB,CAAE,CACzB,CAAE,CACJ,CAAC;yBACH;qBACF;oBAED,qBAAM,IAAA,oBAAS,EACb,sBAAsB,CAAC,IAAI,EAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,mBAAmB,CAAC,CACrD,EAAA;;oBAHD,SAGC,CAAC;oBAEF,iBAAK,CAAC,GAAG,CAAC,OAAO,CACf,gEAAyD,eAAK,CAAC,IAAI,CACjE,mBAAmB,CACpB,MAAG,CACL,CAAC;;;;;CACH;AApDD,sEAoDC","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\nimport type { Program } from '@babel/types';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport type { ProxifiedModule } from 'magicast';\n\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport * as url from 'url';\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';\nimport { gte, minVersion } from 'semver';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport { builders, generateCode, loadFile, writeFile } from 'magicast';\nimport { PackageDotJson, getPackageVersion } from '../utils/package-json';\nimport { getInitCallInsertionIndex, hasSentryContent } from './utils';\nimport { instrumentRootRouteV1 } from './codemods/root-v1';\nimport { instrumentRootRouteV2 } from './codemods/root-v2';\nimport { instrumentHandleError } from './codemods/handle-error';\n\nexport type PartialRemixConfig = {\n  unstable_dev?: boolean;\n  future?: {\n    v2_dev?: boolean;\n    v2_errorBoundary?: boolean;\n    v2_headers?: boolean;\n    v2_meta?: boolean;\n    v2_normalizeFormMethod?: boolean;\n    v2_routeConvention?: boolean;\n  };\n};\n\nconst REMIX_CONFIG_FILE = 'remix.config.js';\n\nfunction insertClientInitCall(\n  dsn: string,\n  originalHooksMod: ProxifiedModule<any>,\n): void {\n  const initCall = builders.functionCall('Sentry.init', {\n    dsn,\n    tracesSampleRate: 1.0,\n    replaysSessionSampleRate: 0.1,\n    replaysOnErrorSampleRate: 1.0,\n    integrations: [\n      builders.newExpression('Sentry.BrowserTracing', {\n        routingInstrumentation: builders.functionCall(\n          'Sentry.remixRouterInstrumentation',\n          builders.raw('useEffect'),\n          builders.raw('useLocation'),\n          builders.raw('useMatches'),\n        ),\n      }),\n      builders.newExpression('Sentry.Replay'),\n    ],\n  });\n\n  const originalHooksModAST = originalHooksMod.$ast as Program;\n  const initCallInsertionIndex = getInitCallInsertionIndex(originalHooksModAST);\n\n  originalHooksModAST.body.splice(\n    initCallInsertionIndex,\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    generateCode(initCall).code,\n  );\n}\n\nfunction insertServerInitCall(\n  dsn: string,\n  originalHooksMod: ProxifiedModule<any>,\n) {\n  const initCall = builders.functionCall('Sentry.init', {\n    dsn,\n    tracesSampleRate: 1.0,\n  });\n\n  const originalHooksModAST = originalHooksMod.$ast as Program;\n\n  const initCallInsertionIndex = getInitCallInsertionIndex(originalHooksModAST);\n\n  originalHooksModAST.body.splice(\n    initCallInsertionIndex,\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    generateCode(initCall).code,\n  );\n}\n\nexport function isRemixV2(\n  remixConfig: PartialRemixConfig,\n  packageJson: PackageDotJson,\n): boolean {\n  const remixVersion = getPackageVersion('@remix-run/react', packageJson);\n  if (!remixVersion) {\n    return false;\n  }\n\n  const minVer = minVersion(remixVersion);\n\n  if (!minVer) {\n    return false;\n  }\n\n  const isV2Remix = gte(minVer, '2.0.0');\n\n  return isV2Remix || remixConfig?.future?.v2_errorBoundary || false;\n}\n\nexport async function loadRemixConfig(): Promise<PartialRemixConfig> {\n  const configFilePath = path.join(process.cwd(), REMIX_CONFIG_FILE);\n\n  try {\n    if (!fs.existsSync(configFilePath)) {\n      return {};\n    }\n\n    const configUrl = url.pathToFileURL(configFilePath).href;\n    const remixConfigModule = (await import(configUrl)) as {\n      default: PartialRemixConfig;\n    };\n\n    return remixConfigModule?.default || {};\n  } catch (e: unknown) {\n    clack.log.error(`Couldn't load ${REMIX_CONFIG_FILE}.`);\n    clack.log.info(\n      chalk.dim(\n        typeof e === 'object' && e != null && 'toString' in e\n          ? e.toString()\n          : typeof e === 'string'\n          ? e\n          : 'Unknown error',\n      ),\n    );\n\n    return {};\n  }\n}\n\nexport async function instrumentRootRoute(\n  isV2?: boolean,\n  isTS?: boolean,\n): Promise<void> {\n  const rootFilename = `root.${isTS ? 'tsx' : 'jsx'}`;\n\n  if (isV2) {\n    await instrumentRootRouteV2(rootFilename);\n  } else {\n    await instrumentRootRouteV1(rootFilename);\n  }\n\n  clack.log.success(\n    `Successfully instrumented root route ${chalk.cyan(rootFilename)}.`,\n  );\n  /* eslint-enable @typescript-eslint/no-unsafe-member-access */\n}\n\nexport async function updateBuildScript(args: {\n  org: string;\n  project: string;\n  url?: string;\n}): Promise<void> {\n  /* eslint-disable @typescript-eslint/no-unsafe-member-access */\n  // Add sourcemaps option to build script\n  const packageJsonPath = path.join(process.cwd(), 'package.json');\n  const packageJsonString = (\n    await fs.promises.readFile(packageJsonPath)\n  ).toString();\n  const packageJson = JSON.parse(packageJsonString);\n\n  if (!packageJson.scripts) {\n    packageJson.scripts = {};\n  }\n\n  if (!packageJson.scripts.build) {\n    packageJson.scripts.build =\n      `remix build --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +\n      (args.url ? ` --url ${args.url}` : '');\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n  } else if (packageJson.scripts.build.includes('remix build')) {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n    packageJson.scripts.build = packageJson.scripts.build.replace(\n      'remix build',\n      'remix build --sourcemap && sentry-upload-sourcemaps',\n    );\n  }\n\n  await fs.promises.writeFile(\n    packageJsonPath,\n    JSON.stringify(packageJson, null, 2),\n  );\n\n  clack.log.success(\n    `Successfully updated ${chalk.cyan('build')} script in ${chalk.cyan(\n      'package.json',\n    )} to generate and upload sourcemaps.`,\n  );\n  /* eslint-enable @typescript-eslint/no-unsafe-member-access */\n}\n\nexport async function initializeSentryOnEntryClient(\n  dsn: string,\n  isTS: boolean,\n): Promise<void> {\n  const clientEntryFilename = `entry.client.${isTS ? 'tsx' : 'jsx'}`;\n\n  const originalEntryClient = path.join(\n    process.cwd(),\n    'app',\n    clientEntryFilename,\n  );\n\n  const originalEntryClientMod = await loadFile(originalEntryClient);\n\n  if (hasSentryContent(originalEntryClient, originalEntryClientMod.$code)) {\n    return;\n  }\n\n  originalEntryClientMod.imports.$add({\n    from: '@sentry/remix',\n    imported: '*',\n    local: 'Sentry',\n  });\n\n  originalEntryClientMod.imports.$add({\n    from: 'react',\n    imported: 'useEffect',\n    local: 'useEffect',\n  });\n\n  originalEntryClientMod.imports.$add({\n    from: '@remix-run/react',\n    imported: 'useLocation',\n    local: 'useLocation',\n  });\n\n  originalEntryClientMod.imports.$add({\n    from: '@remix-run/react',\n    imported: 'useMatches',\n    local: 'useMatches',\n  });\n\n  insertClientInitCall(dsn, originalEntryClientMod);\n\n  await writeFile(\n    originalEntryClientMod.$ast,\n    path.join(process.cwd(), 'app', clientEntryFilename),\n  );\n\n  clack.log.success(\n    `Successfully initialized Sentry on client entry point ${chalk.cyan(\n      clientEntryFilename,\n    )}`,\n  );\n}\n\nexport async function initializeSentryOnEntryServer(\n  dsn: string,\n  isV2: boolean,\n  isTS: boolean,\n): Promise<void> {\n  const serverEntryFilename = `entry.server.${isTS ? 'tsx' : 'jsx'}`;\n\n  const originalEntryServer = path.join(\n    process.cwd(),\n    'app',\n    serverEntryFilename,\n  );\n\n  const originalEntryServerMod = await loadFile(originalEntryServer);\n\n  if (hasSentryContent(originalEntryServer, originalEntryServerMod.$code)) {\n    return;\n  }\n\n  originalEntryServerMod.imports.$add({\n    from: '@sentry/remix',\n    imported: '*',\n    local: 'Sentry',\n  });\n\n  insertServerInitCall(dsn, originalEntryServerMod);\n\n  if (isV2) {\n    const handleErrorInstrumented = instrumentHandleError(\n      originalEntryServerMod,\n      serverEntryFilename,\n    );\n\n    if (handleErrorInstrumented) {\n      clack.log.success(\n        `Instrumented ${chalk.cyan('handleError')} in ${chalk.cyan(\n          `${serverEntryFilename}`,\n        )}`,\n      );\n    }\n  }\n\n  await writeFile(\n    originalEntryServerMod.$ast,\n    path.join(process.cwd(), 'app', serverEntryFilename),\n  );\n\n  clack.log.success(\n    `Successfully initialized Sentry on server entry point ${chalk.cyan(\n      serverEntryFilename,\n    )}.`,\n  );\n}\n"]}
+{"version":3,"file":"sdk-setup.js","sourceRoot":"","sources":["../../../src/remix/sdk-setup.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n\nimport type { Program } from '@babel/types';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport type { ProxifiedModule } from 'magicast';\n\nimport * as fs from 'fs';\nimport * as path from 'path';\nimport * as url from 'url';\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';\nimport { gte, minVersion } from 'semver';\n\n// @ts-expect-error - magicast is ESM and TS complains about that. It works though\nimport { builders, generateCode, loadFile, writeFile } from 'magicast';\nimport { PackageDotJson, getPackageVersion } from '../utils/package-json';\nimport { getInitCallInsertionIndex, hasSentryContent } from './utils';\nimport { instrumentRootRouteV1 } from './codemods/root-v1';\nimport { instrumentRootRouteV2 } from './codemods/root-v2';\nimport { instrumentHandleError } from './codemods/handle-error';\n\nexport type PartialRemixConfig = {\n  unstable_dev?: boolean;\n  future?: {\n    v2_dev?: boolean;\n    v2_errorBoundary?: boolean;\n    v2_headers?: boolean;\n    v2_meta?: boolean;\n    v2_normalizeFormMethod?: boolean;\n    v2_routeConvention?: boolean;\n  };\n};\n\nconst REMIX_CONFIG_FILE = 'remix.config.js';\n\nfunction insertClientInitCall(\n  dsn: string,\n  originalHooksMod: ProxifiedModule<any>,\n): void {\n  const initCall = builders.functionCall('Sentry.init', {\n    dsn,\n    tracesSampleRate: 1.0,\n    replaysSessionSampleRate: 0.1,\n    replaysOnErrorSampleRate: 1.0,\n    integrations: [\n      builders.newExpression('Sentry.BrowserTracing', {\n        routingInstrumentation: builders.functionCall(\n          'Sentry.remixRouterInstrumentation',\n          builders.raw('useEffect'),\n          builders.raw('useLocation'),\n          builders.raw('useMatches'),\n        ),\n      }),\n      builders.newExpression('Sentry.Replay'),\n    ],\n  });\n\n  const originalHooksModAST = originalHooksMod.$ast as Program;\n  const initCallInsertionIndex = getInitCallInsertionIndex(originalHooksModAST);\n\n  originalHooksModAST.body.splice(\n    initCallInsertionIndex,\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    generateCode(initCall).code,\n  );\n}\n\nfunction insertServerInitCall(\n  dsn: string,\n  originalHooksMod: ProxifiedModule<any>,\n) {\n  const initCall = builders.functionCall('Sentry.init', {\n    dsn,\n    tracesSampleRate: 1.0,\n  });\n\n  const originalHooksModAST = originalHooksMod.$ast as Program;\n\n  const initCallInsertionIndex = getInitCallInsertionIndex(originalHooksModAST);\n\n  originalHooksModAST.body.splice(\n    initCallInsertionIndex,\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    generateCode(initCall).code,\n  );\n}\n\nexport function isRemixV2(\n  remixConfig: PartialRemixConfig,\n  packageJson: PackageDotJson,\n): boolean {\n  const remixVersion = getPackageVersion('@remix-run/react', packageJson);\n  if (!remixVersion) {\n    return false;\n  }\n\n  const minVer = minVersion(remixVersion);\n\n  if (!minVer) {\n    return false;\n  }\n\n  const isV2Remix = gte(minVer, '2.0.0');\n\n  return isV2Remix || remixConfig?.future?.v2_errorBoundary || false;\n}\n\nexport async function loadRemixConfig(): Promise<PartialRemixConfig> {\n  const configFilePath = path.join(process.cwd(), REMIX_CONFIG_FILE);\n\n  try {\n    if (!fs.existsSync(configFilePath)) {\n      return {};\n    }\n\n    const configUrl = url.pathToFileURL(configFilePath).href;\n    const remixConfigModule = (await import(configUrl)) as {\n      default: PartialRemixConfig;\n    };\n\n    return remixConfigModule?.default || {};\n  } catch (e: unknown) {\n    clack.log.error(`Couldn't load ${REMIX_CONFIG_FILE}.`);\n    clack.log.info(\n      chalk.dim(\n        typeof e === 'object' && e != null && 'toString' in e\n          ? e.toString()\n          : typeof e === 'string'\n          ? e\n          : 'Unknown error',\n      ),\n    );\n\n    return {};\n  }\n}\n\nexport async function instrumentRootRoute(\n  isV2?: boolean,\n  isTS?: boolean,\n): Promise<void> {\n  const rootFilename = `root.${isTS ? 'tsx' : 'jsx'}`;\n\n  if (isV2) {\n    await instrumentRootRouteV2(rootFilename);\n  } else {\n    await instrumentRootRouteV1(rootFilename);\n  }\n\n  clack.log.success(\n    `Successfully instrumented root route ${chalk.cyan(rootFilename)}.`,\n  );\n  /* eslint-enable @typescript-eslint/no-unsafe-member-access */\n}\n\nexport async function updateBuildScript(args: {\n  org: string;\n  project: string;\n  url?: string;\n  isHydrogen: boolean;\n}): Promise<void> {\n  /* eslint-disable @typescript-eslint/no-unsafe-member-access */\n  // Add sourcemaps option to build script\n  const packageJsonPath = path.join(process.cwd(), 'package.json');\n  const packageJsonString = (\n    await fs.promises.readFile(packageJsonPath)\n  ).toString();\n  const packageJson = JSON.parse(packageJsonString);\n\n  if (!packageJson.scripts) {\n    packageJson.scripts = {};\n  }\n\n  const buildCommand = args.isHydrogen\n    ? 'shopify hydrogen build'\n    : 'remix build';\n\n  const instrumentedBuildCommand =\n    `${buildCommand} --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +\n    (args.url ? ` --url ${args.url}` : '') +\n    (args.isHydrogen ? ' --buildPath ./dist' : '');\n\n  if (!packageJson.scripts.build) {\n    packageJson.scripts.build = instrumentedBuildCommand;\n\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n  } else if (packageJson.scripts.build.includes(buildCommand)) {\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-call\n    packageJson.scripts.build = packageJson.scripts.build.replace(\n      buildCommand,\n      instrumentedBuildCommand,\n    );\n  }\n\n  await fs.promises.writeFile(\n    packageJsonPath,\n    JSON.stringify(packageJson, null, 2),\n  );\n\n  clack.log.success(\n    `Successfully updated ${chalk.cyan('build')} script in ${chalk.cyan(\n      'package.json',\n    )} to generate and upload sourcemaps.`,\n  );\n  /* eslint-enable @typescript-eslint/no-unsafe-member-access */\n}\n\nexport async function initializeSentryOnEntryClient(\n  dsn: string,\n  isTS: boolean,\n): Promise<void> {\n  const clientEntryFilename = `entry.client.${isTS ? 'tsx' : 'jsx'}`;\n\n  const originalEntryClient = path.join(\n    process.cwd(),\n    'app',\n    clientEntryFilename,\n  );\n\n  const originalEntryClientMod = await loadFile(originalEntryClient);\n\n  if (hasSentryContent(originalEntryClient, originalEntryClientMod.$code)) {\n    return;\n  }\n\n  originalEntryClientMod.imports.$add({\n    from: '@sentry/remix',\n    imported: '*',\n    local: 'Sentry',\n  });\n\n  originalEntryClientMod.imports.$add({\n    from: 'react',\n    imported: 'useEffect',\n    local: 'useEffect',\n  });\n\n  originalEntryClientMod.imports.$add({\n    from: '@remix-run/react',\n    imported: 'useLocation',\n    local: 'useLocation',\n  });\n\n  originalEntryClientMod.imports.$add({\n    from: '@remix-run/react',\n    imported: 'useMatches',\n    local: 'useMatches',\n  });\n\n  insertClientInitCall(dsn, originalEntryClientMod);\n\n  await writeFile(\n    originalEntryClientMod.$ast,\n    path.join(process.cwd(), 'app', clientEntryFilename),\n  );\n\n  clack.log.success(\n    `Successfully initialized Sentry on client entry point ${chalk.cyan(\n      clientEntryFilename,\n    )}`,\n  );\n}\n\nexport async function initializeSentryOnEntryServer(\n  dsn: string,\n  isV2: boolean,\n  isTS: boolean,\n): Promise<void> {\n  const serverEntryFilename = `entry.server.${isTS ? 'tsx' : 'jsx'}`;\n\n  const originalEntryServer = path.join(\n    process.cwd(),\n    'app',\n    serverEntryFilename,\n  );\n\n  const originalEntryServerMod = await loadFile(originalEntryServer);\n\n  if (hasSentryContent(originalEntryServer, originalEntryServerMod.$code)) {\n    return;\n  }\n\n  originalEntryServerMod.imports.$add({\n    from: '@sentry/remix',\n    imported: '*',\n    local: 'Sentry',\n  });\n\n  insertServerInitCall(dsn, originalEntryServerMod);\n\n  if (isV2) {\n    const handleErrorInstrumented = instrumentHandleError(\n      originalEntryServerMod,\n      serverEntryFilename,\n    );\n\n    if (handleErrorInstrumented) {\n      clack.log.success(\n        `Instrumented ${chalk.cyan('handleError')} in ${chalk.cyan(\n          `${serverEntryFilename}`,\n        )}`,\n      );\n    }\n  }\n\n  await writeFile(\n    originalEntryServerMod.$ast,\n    path.join(process.cwd(), 'app', serverEntryFilename),\n  );\n\n  clack.log.success(\n    `Successfully initialized Sentry on server entry point ${chalk.cyan(\n      serverEntryFilename,\n    )}.`,\n  );\n}\n"]}

package/dist/src/remix/templates.d.ts

@@ -1,2 +1,2 @@
 export declare const ERROR_BOUNDARY_TEMPLATE_V2 = "const ErrorBoundary = () => {\n  const error = useRouteError();\n  captureRemixErrorBoundaryError(error);\n  return <div>Something went wrong</div>;\n};\n";
-export declare const HANDLE_ERROR_TEMPLATE_V2 = "function handleError(error) {\n  if (error instanceof Error) {\n    Sentry.captureRemixErrorBoundaryError(error);\n  } else {\n    Sentry.captureException(error);\n  }\n}\n";
+export declare const HANDLE_ERROR_TEMPLATE_V2 = "function handleError(error, { request }) {\n  Sentry.captureRemixServerException(error, 'remix.server', request);\n}\n";

package/dist/src/remix/templates.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HANDLE_ERROR_TEMPLATE_V2 = exports.ERROR_BOUNDARY_TEMPLATE_V2 = void 0;
 exports.ERROR_BOUNDARY_TEMPLATE_V2 = "const ErrorBoundary = () => {\n  const error = useRouteError();\n  captureRemixErrorBoundaryError(error);\n  return <div>Something went wrong</div>;\n};\n";
-exports.HANDLE_ERROR_TEMPLATE_V2 = "function handleError(error) {\n  if (error instanceof Error) {\n    Sentry.captureRemixErrorBoundaryError(error);\n  } else {\n    Sentry.captureException(error);\n  }\n}\n";
+exports.HANDLE_ERROR_TEMPLATE_V2 = "function handleError(error, { request }) {\n  Sentry.captureRemixServerException(error, 'remix.server', request);\n}\n";
 //# sourceMappingURL=templates.js.map

package/dist/src/remix/templates.js.map

@@ -1 +1 @@
-{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../../src/remix/templates.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,4JAKzC,CAAC;AAEW,QAAA,wBAAwB,GAAG,8KAOvC,CAAC","sourcesContent":["export const ERROR_BOUNDARY_TEMPLATE_V2 = `const ErrorBoundary = () => {\n  const error = useRouteError();\n  captureRemixErrorBoundaryError(error);\n  return <div>Something went wrong</div>;\n};\n`;\n\nexport const HANDLE_ERROR_TEMPLATE_V2 = `function handleError(error) {\n  if (error instanceof Error) {\n    Sentry.captureRemixErrorBoundaryError(error);\n  } else {\n    Sentry.captureException(error);\n  }\n}\n`;\n"]}
+{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../../src/remix/templates.ts"],"names":[],"mappings":";;;AAAa,QAAA,0BAA0B,GAAG,4JAKzC,CAAC;AAEW,QAAA,wBAAwB,GAAG,wHAGvC,CAAC","sourcesContent":["export const ERROR_BOUNDARY_TEMPLATE_V2 = `const ErrorBoundary = () => {\n  const error = useRouteError();\n  captureRemixErrorBoundaryError(error);\n  return <div>Something went wrong</div>;\n};\n`;\n\nexport const HANDLE_ERROR_TEMPLATE_V2 = `function handleError(error, { request }) {\n  Sentry.captureRemixServerException(error, 'remix.server', request);\n}\n`;\n"]}

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

@@ -1,6 +1,8 @@
 import type { Program } from '@babel/types';
+import { PackageDotJson } from '../utils/package-json';
 export declare function hasSentryContent(fileName: string, fileContent: string): boolean;
 /**
  * We want to insert the init call on top of the file but after all import statements
  */
 export declare function getInitCallInsertionIndex(originalHooksModAST: Program): number;
+export declare function isHydrogenApp(packageJson: PackageDotJson): boolean;

package/dist/src/remix/utils.js

@@ -26,11 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInitCallInsertionIndex = exports.hasSentryContent = void 0;
+exports.isHydrogenApp = exports.getInitCallInsertionIndex = exports.hasSentryContent = void 0;
 var path = __importStar(require("path"));
 // @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 package_json_1 = require("../utils/package-json");
 // Copied from sveltekit wizard
 function hasSentryContent(fileName, fileContent) {
     var includesContent = fileContent.includes('@sentry/remix');
@@ -52,4 +53,8 @@ function getInitCallInsertionIndex(originalHooksModAST) {
     return 0;
 }
 exports.getInitCallInsertionIndex = getInitCallInsertionIndex;
+function isHydrogenApp(packageJson) {
+    return (0, package_json_1.hasPackageInstalled)('@shopify/hydrogen', packageJson);
+}
+exports.isHydrogenApp = isHydrogenApp;
 //# sourceMappingURL=utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/remix/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAA6B;AAE7B,+EAA+E;AAC/E,2DAAmC;AACnC,gDAA0B;AAE1B,+BAA+B;AAC/B,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,WAAmB;IAEnB,IAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAE9D,IAAI,eAAe,EAAE;QACnB,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,eAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,qFACP,eAAK,CAAC,IAAI,CAC5C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,MAAG,CACL,CAAC;KACH;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAhBD,4CAgBC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CACvC,mBAA4B;IAE5B,KAAK,IAAI,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7D,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,EAAE;YAC5D,OAAO,CAAC,GAAG,CAAC,CAAC;SACd;KACF;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAVD,8DAUC","sourcesContent":["import type { Program } from '@babel/types';\n\nimport * as path from 'path';\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// Copied from sveltekit wizard\nexport function hasSentryContent(\n  fileName: string,\n  fileContent: string,\n): boolean {\n  const includesContent = fileContent.includes('@sentry/remix');\n\n  if (includesContent) {\n    clack.log.warn(\n      `File ${chalk.cyan(path.basename(fileName))} already contains Sentry code.\nSkipping adding Sentry functionality to ${chalk.cyan(\n        path.basename(fileName),\n      )}.`,\n    );\n  }\n\n  return includesContent;\n}\n\n/**\n * We want to insert the init call on top of the file but after all import statements\n */\nexport function getInitCallInsertionIndex(\n  originalHooksModAST: Program,\n): number {\n  for (let x = originalHooksModAST.body.length - 1; x >= 0; x--) {\n    if (originalHooksModAST.body[x].type === 'ImportDeclaration') {\n      return x + 1;\n    }\n  }\n\n  return 0;\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/remix/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAA6B;AAE7B,+EAA+E;AAC/E,2DAAmC;AACnC,gDAA0B;AAC1B,sDAA4E;AAE5E,+BAA+B;AAC/B,SAAgB,gBAAgB,CAC9B,QAAgB,EAChB,WAAmB;IAEnB,IAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;IAE9D,IAAI,eAAe,EAAE;QACnB,iBAAK,CAAC,GAAG,CAAC,IAAI,CACZ,eAAQ,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,qFACP,eAAK,CAAC,IAAI,CAC5C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,MAAG,CACL,CAAC;KACH;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAhBD,4CAgBC;AAED;;GAEG;AACH,SAAgB,yBAAyB,CACvC,mBAA4B;IAE5B,KAAK,IAAI,CAAC,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QAC7D,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,EAAE;YAC5D,OAAO,CAAC,GAAG,CAAC,CAAC;SACd;KACF;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAVD,8DAUC;AAED,SAAgB,aAAa,CAAC,WAA2B;IACvD,OAAO,IAAA,kCAAmB,EAAC,mBAAmB,EAAE,WAAW,CAAC,CAAC;AAC/D,CAAC;AAFD,sCAEC","sourcesContent":["import type { Program } from '@babel/types';\n\nimport * as path from 'path';\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';\nimport { PackageDotJson, hasPackageInstalled } from '../utils/package-json';\n\n// Copied from sveltekit wizard\nexport function hasSentryContent(\n  fileName: string,\n  fileContent: string,\n): boolean {\n  const includesContent = fileContent.includes('@sentry/remix');\n\n  if (includesContent) {\n    clack.log.warn(\n      `File ${chalk.cyan(path.basename(fileName))} already contains Sentry code.\nSkipping adding Sentry functionality to ${chalk.cyan(\n        path.basename(fileName),\n      )}.`,\n    );\n  }\n\n  return includesContent;\n}\n\n/**\n * We want to insert the init call on top of the file but after all import statements\n */\nexport function getInitCallInsertionIndex(\n  originalHooksModAST: Program,\n): number {\n  for (let x = originalHooksModAST.body.length - 1; x >= 0; x--) {\n    if (originalHooksModAST.body[x].type === 'ImportDeclaration') {\n      return x + 1;\n    }\n  }\n\n  return 0;\n}\n\nexport function isHydrogenApp(packageJson: PackageDotJson): boolean {\n  return hasPackageInstalled('@shopify/hydrogen', packageJson);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wizard",
-  "version": "3.14.1",
+  "version": "3.15.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/remix/codemods/handle-error.ts

@@ -55,12 +55,42 @@ export function instrumentHandleError(
   ) {
     return false;
   } else {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const implementation = recast.parse(HANDLE_ERROR_TEMPLATE_V2).program
+      .body[0];
+
     // @ts-expect-error - string works here because the AST is proxified by magicast
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
     handleErrorFunction.declaration.body.body.unshift(
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       recast.parse(HANDLE_ERROR_TEMPLATE_V2).program.body[0].body.body[0],
     );
+
+    // First parameter is the error
+    //
+    // @ts-expect-error - string works here because the AST is proxified by magicast
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    handleErrorFunction.declaration.params[0] = implementation.params[0];
+
+    // Second parameter is the request inside an object
+    // Merging the object properties to make sure it includes request
+    //
+    // @ts-expect-error - string works here because the AST is proxified by magicast
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    if (handleErrorFunction.declaration.params?.[1]?.properties) {
+      // @ts-expect-error - string works here because the AST is proxified by magicast
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+      handleErrorFunction.declaration.params[1].properties.push(
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        implementation.params[1].properties[0],
+      );
+    } else {
+      // Create second parameter if it doesn't exist
+      //
+      // @ts-expect-error - string works here because the AST is proxified by magicast
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      handleErrorFunction.declaration.params[1] = implementation.params[1];
+    }
   }
 
   return true;

package/src/remix/codemods/root-common.ts

@@ -0,0 +1,63 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+
+import * as recast from 'recast';
+// @ts-expect-error - clack is ESM and TS complains about that. It works though
+import clack from '@clack/prompts';
+import chalk from 'chalk';
+
+// @ts-expect-error - magicast is ESM and TS complains about that. It works though
+import { builders, ProxifiedModule, generateCode } from 'magicast';
+
+export function wrapAppWithSentry(
+  rootRouteAst: ProxifiedModule,
+  rootFileName: string,
+) {
+  rootRouteAst.imports.$add({
+    from: '@sentry/remix',
+    imported: 'withSentry',
+    local: 'withSentry',
+  });
+
+  recast.visit(rootRouteAst.$ast, {
+    visitExportDefaultDeclaration(path) {
+      if (path.value.declaration.type === 'FunctionDeclaration') {
+        // Move the function declaration just before the default export
+        path.insertBefore(path.value.declaration);
+
+        // Get the name of the function to be wrapped
+        const functionName: string = path.value.declaration.id.name as string;
+
+        // Create the wrapped function call
+        const functionCall = recast.types.builders.callExpression(
+          recast.types.builders.identifier('withSentry'),
+          [recast.types.builders.identifier(functionName)],
+        );
+
+        // Replace the default export with the wrapped function call
+        path.value.declaration = functionCall;
+      } else if (path.value.declaration.type === 'Identifier') {
+        const rootRouteExport = rootRouteAst.exports.default;
+
+        const expressionToWrap = generateCode(rootRouteExport.$ast).code;
+
+        rootRouteAst.exports.default = builders.raw(
+          `withSentry(${expressionToWrap})`,
+        );
+      } else {
+        clack.log.warn(
+          chalk.yellow(
+            `Couldn't instrument ${chalk.bold(
+              rootFileName,
+            )} automatically. Wrap your default export with: ${chalk.dim(
+              'withSentry()',
+            )}\n`,
+          ),
+        );
+      }
+
+      this.traverse(path);
+    },
+  });
+}

package/src/remix/codemods/root-v1.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 
-import * as recast from 'recast';
 import * as path from 'path';
 
 // @ts-expect-error - clack is ESM and TS complains about that. It works though
@@ -8,7 +7,8 @@ import clack from '@clack/prompts';
 import chalk from 'chalk';
 
 // @ts-expect-error - magicast is ESM and TS complains about that. It works though
-import { builders, generateCode, loadFile, writeFile } from 'magicast';
+import { loadFile, writeFile } from 'magicast';
+import { wrapAppWithSentry } from './root-common';
 
 export async function instrumentRootRouteV1(
   rootFileName: string,
@@ -18,57 +18,7 @@ export async function instrumentRootRouteV1(
       path.join(process.cwd(), 'app', rootFileName),
     );
 
-    rootRouteAst.imports.$add({
-      from: '@sentry/remix',
-      imported: 'withSentry',
-      local: 'withSentry',
-    });
-
-    recast.visit(rootRouteAst.$ast, {
-      visitExportDefaultDeclaration(path) {
-        /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-        if (path.value.declaration.type === 'FunctionDeclaration') {
-          // Move the function declaration just before the default export
-          path.insertBefore(path.value.declaration);
-
-          // Get the name of the function to be wrapped
-          const functionName: string = path.value.declaration.id.name as string;
-
-          // Create the wrapped function call
-          const functionCall = recast.types.builders.callExpression(
-            recast.types.builders.identifier('withSentry'),
-            [recast.types.builders.identifier(functionName)],
-          );
-
-          // Replace the default export with the wrapped function call
-          path.value.declaration = functionCall;
-        } else if (path.value.declaration.type === 'Identifier') {
-          const rootRouteExport = rootRouteAst.exports.default;
-
-          const expressionToWrap = generateCode(
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-            rootRouteExport.$ast,
-          ).code;
-
-          rootRouteAst.exports.default = builders.raw(
-            `withSentry(${expressionToWrap})`,
-          );
-        } else {
-          clack.log.warn(
-            chalk.yellow(
-              `Couldn't instrument ${chalk.bold(
-                rootFileName,
-              )} automatically. Wrap your default export with: ${chalk.dim(
-                'withSentry()',
-              )}\n`,
-            ),
-          );
-        }
-
-        this.traverse(path);
-        /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-      },
-    });
+    wrapAppWithSentry(rootRouteAst, rootFileName);
 
     await writeFile(
       rootRouteAst.$ast,

package/src/remix/codemods/root-v2.ts

@@ -1,4 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 
 import * as recast from 'recast';
 import * as path from 'path';
@@ -9,6 +12,8 @@ import type { ExportNamedDeclaration, Program } from '@babel/types';
 import { loadFile, writeFile } from 'magicast';
 
 import { ERROR_BOUNDARY_TEMPLATE_V2 } from '../templates';
+import { hasSentryContent } from '../utils';
+import { wrapAppWithSentry } from './root-common';
 
 export async function instrumentRootRouteV2(
   rootFileName: string,
@@ -63,18 +68,82 @@ export async function instrumentRootRouteV2(
 
     recast.visit(rootRouteAst.$ast, {
       visitExportDefaultDeclaration(path) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         const implementation = recast.parse(ERROR_BOUNDARY_TEMPLATE_V2).program
           .body[0];
 
         path.insertBefore(
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
           recast.types.builders.exportDeclaration(false, implementation),
         );
 
         this.traverse(path);
       },
     });
+    // If there is already a ErrorBoundary export, and it doesn't have Sentry content
+  } else if (!hasSentryContent(rootFileName, rootRouteAst.$code)) {
+    rootRouteAst.imports.$add({
+      from: '@sentry/remix',
+      imported: 'captureRemixErrorBoundaryError',
+      local: 'captureRemixErrorBoundaryError',
+    });
+
+    wrapAppWithSentry(rootRouteAst, rootFileName);
+
+    recast.visit(rootRouteAst.$ast, {
+      visitExportNamedDeclaration(path) {
+        // Find ErrorBoundary export
+        if (path.value.declaration?.id?.name === 'ErrorBoundary') {
+          const errorBoundaryExport = path.value.declaration;
+
+          let errorIdentifier;
+
+          // check if useRouteError is called
+          recast.visit(errorBoundaryExport, {
+            visitVariableDeclaration(path) {
+              const variableDeclaration = path.value.declarations[0];
+              const initializer = variableDeclaration.init;
+
+              if (
+                initializer.type === 'CallExpression' &&
+                initializer.callee.name === 'useRouteError'
+              ) {
+                errorIdentifier = variableDeclaration.id.name;
+              }
+
+              this.traverse(path);
+            },
+          });
+
+          // We don't have an errorIdentifier, which means useRouteError is not called / imported
+          // We need to add it and capture the error
+          if (!errorIdentifier) {
+            rootRouteAst.imports.$add({
+              from: '@remix-run/react',
+              imported: 'useRouteError',
+              local: 'useRouteError',
+            });
+
+            const useRouteErrorCall = recast.parse(
+              `const error = useRouteError();`,
+            ).program.body[0];
+
+            // Insert at the top of ErrorBoundary body
+            errorBoundaryExport.body.body.splice(0, 0, useRouteErrorCall);
+          }
+
+          const captureErrorCall = recast.parse(
+            `captureRemixErrorBoundaryError(error);`,
+          ).program.body[0];
+
+          // Insert just before the the fallback page is returned
+          errorBoundaryExport.body.body.splice(
+            errorBoundaryExport.body.body.length - 1,
+            0,
+            captureErrorCall,
+          );
+        }
+        this.traverse(path);
+      },
+    });
   }
 
   await writeFile(

package/src/remix/remix-wizard.ts

@@ -25,6 +25,8 @@ import {
 } from './sdk-setup';
 import { debug } from '../utils/debug';
 import { traceStep, withTelemetry } from '../telemetry';
+import { isHydrogenApp } from './utils';
+import { DEFAULT_URL } from '../../lib/Constants';
 
 export async function runRemixWizard(options: WizardOptions): Promise<void> {
   return withTelemetry(
@@ -73,7 +75,8 @@ async function runRemixWizardWithTelemetry(
       await updateBuildScript({
         org: selectedProject.organization.slug,
         project: selectedProject.name,
-        url: sentryUrl,
+        url: sentryUrl === DEFAULT_URL ? undefined : sentryUrl,
+        isHydrogen: isHydrogenApp(packageJson),
       });
     } catch (e) {
       clack.log
@@ -88,7 +91,7 @@ async function runRemixWizardWithTelemetry(
       await instrumentRootRoute(isV2, isTS);
     } catch (e) {
       clack.log.warn(`Could not instrument root route.
-  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/`);
+  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);
       debug(e);
     }
   });
@@ -98,7 +101,7 @@ async function runRemixWizardWithTelemetry(
       await initializeSentryOnEntryClient(dsn, isTS);
     } catch (e) {
       clack.log.warn(`Could not initialize Sentry on client entry.
-  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/`);
+  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);
       debug(e);
     }
   });
@@ -108,7 +111,7 @@ async function runRemixWizardWithTelemetry(
       await initializeSentryOnEntryServer(dsn, isV2, isTS);
     } catch (e) {
       clack.log.warn(`Could not initialize Sentry on server entry.
-  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/`);
+  Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/manual-setup/`);
       debug(e);
     }
   });

package/src/remix/sdk-setup.ts

@@ -164,6 +164,7 @@ export async function updateBuildScript(args: {
   org: string;
   project: string;
   url?: string;
+  isHydrogen: boolean;
 }): Promise<void> {
   /* eslint-disable @typescript-eslint/no-unsafe-member-access */
   // Add sourcemaps option to build script
@@ -177,17 +178,24 @@ export async function updateBuildScript(args: {
     packageJson.scripts = {};
   }
 
+  const buildCommand = args.isHydrogen
+    ? 'shopify hydrogen build'
+    : 'remix build';
+
+  const instrumentedBuildCommand =
+    `${buildCommand} --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +
+    (args.url ? ` --url ${args.url}` : '') +
+    (args.isHydrogen ? ' --buildPath ./dist' : '');
+
   if (!packageJson.scripts.build) {
-    packageJson.scripts.build =
-      `remix build --sourcemap && sentry-upload-sourcemaps --org ${args.org} --project ${args.project}` +
-      (args.url ? ` --url ${args.url}` : '');
+    packageJson.scripts.build = instrumentedBuildCommand;
 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-  } else if (packageJson.scripts.build.includes('remix build')) {
+  } else if (packageJson.scripts.build.includes(buildCommand)) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     packageJson.scripts.build = packageJson.scripts.build.replace(
-      'remix build',
-      'remix build --sourcemap && sentry-upload-sourcemaps',
+      buildCommand,
+      instrumentedBuildCommand,
     );
   }
 

package/src/remix/templates.ts

@@ -5,11 +5,7 @@ export const ERROR_BOUNDARY_TEMPLATE_V2 = `const ErrorBoundary = () => {
 };
 `;
 
-export const HANDLE_ERROR_TEMPLATE_V2 = `function handleError(error) {
-  if (error instanceof Error) {
-    Sentry.captureRemixErrorBoundaryError(error);
-  } else {
-    Sentry.captureException(error);
-  }
+export const HANDLE_ERROR_TEMPLATE_V2 = `function handleError(error, { request }) {
+  Sentry.captureRemixServerException(error, 'remix.server', request);
 }
 `;

package/src/remix/utils.ts

@@ -5,6 +5,7 @@ import * as path from 'path';
 // @ts-expect-error - clack is ESM and TS complains about that. It works though
 import clack from '@clack/prompts';
 import chalk from 'chalk';
+import { PackageDotJson, hasPackageInstalled } from '../utils/package-json';
 
 // Copied from sveltekit wizard
 export function hasSentryContent(
@@ -39,3 +40,7 @@ export function getInitCallInsertionIndex(
 
   return 0;
 }
+
+export function isHydrogenApp(packageJson: PackageDotJson): boolean {
+  return hasPackageInstalled('@shopify/hydrogen', packageJson);
+}