use cwd for base in regex

Author: lobsterkatie

packages/nextjs/src/config/webpack.ts

@@ -1,5 +1,6 @@
 import { getSentryRelease } from '@sentry/node';
-import { dropUndefinedKeys, escapeStringForRegex, logger } from '@sentry/utils';
+import { dropUndefinedKeys, logger } from '@sentry/utils';
+// import { dropUndefinedKeys, escapeStringForRegex, logger } from '@sentry/utils';
 import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
 import * as fs from 'fs';
 import * as os from 'os';
@@ -155,9 +156,10 @@ async function addSentryToEntryProperty(
     );
     console.log('cwd', process.cwd());
     console.log('buildContext.dir', buildContext.dir);
-    const buildDirAbsPath = escapeStringForRegex(path.resolve(buildContext.dir, buildContext.config.distDir));
-    const awsAbsPath = escapeStringForRegex(path.resolve('/var/task', buildContext.config.distDir));
-    fs.writeFileSync(rewriteFramesHelper, `global.__rewriteFramesRegex__ = '${buildDirAbsPath}|${awsAbsPath}';\n`);
+    // const buildDirAbsPath = escapeStringForRegex(path.resolve(buildContext.dir, buildContext.config.distDir));
+    // const awsAbsPath = escapeStringForRegex(path.resolve('/var/task', buildContext.config.distDir));
+    // fs.writeFileSync(rewriteFramesHelper, `global.__rewriteFramesRegex__ = '${buildDirAbsPath}|${awsAbsPath}';\n`);
+    fs.writeFileSync(rewriteFramesHelper, `global.__rewriteFramesDistDir__ = '${buildContext.config.distDir}';\n`);
     filesToInject.unshift(rewriteFramesHelper);
   }
 

packages/nextjs/src/index.server.ts

@@ -2,6 +2,7 @@ import { RewriteFrames } from '@sentry/integrations';
 import { configureScope, getCurrentHub, init as nodeInit, Integrations } from '@sentry/node';
 import { hasTracingEnabled } from '@sentry/tracing';
 import { escapeStringForRegex, logger } from '@sentry/utils';
+import * as path from 'path';
 
 import { instrumentServer } from './utils/instrumentServer';
 import { MetadataBuilder } from './utils/metadataBuilder';
@@ -49,14 +50,19 @@ function sdkAlreadyInitialized(): boolean {
 
 function addServerIntegrations(options: NextjsOptions): void {
   // This value is injected at build time, based on the output directory specified in the build config
-  const distDirRegex = (global as typeof global & { __rewriteFramesRegex__: string }).__rewriteFramesRegex__;
-  const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex(distDirRegex));
+  const distDir = (global as typeof global & { __rewriteFramesDistDir__: string }).__rewriteFramesDistDir__;
+  const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex(path.resolve(process.cwd(), distDir)));
+  // const distDirRegex = (global as typeof global & { __rewriteFramesRegex__: string }).__rewriteFramesRegex__;
+  // const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex(distDirRegex));
 
-  console.log('distDirRegex:', distDirRegex);
+  // console.log('distDirRegex:', distDirRegex);
   console.log('cwd in addServerIntegrations', process.cwd());
 
   const defaultRewriteFramesIntegration = new RewriteFrames({
     iteratee: frame => {
+      if (frame.filename?.includes('throw')) {
+        debugger;
+      }
       frame.filename = frame.filename?.replace(SOURCEMAP_FILENAME_REGEX, 'app:///_next');
       return frame;
     },