Don't do the funky require thing

🤦‍♂️

This is better

Author: timfish

packages/node/src/eventbuilder.ts

@@ -16,7 +16,7 @@ import { node } from './stack-parser';
  * Extracts stack frames from the error.stack string
  */
 export function extractStackFromError(error: Error): StackFrame[] {
-  return createStackParser(node(require))(error.stack || '');
+  return createStackParser(node)(error.stack || '');
 }
 
 /**

packages/node/src/stack-parser.ts

@@ -1,30 +1,28 @@
 import { basename, dirname, StackLineParser } from '@sentry/utils';
 
 /** Gets the module */
-function getModule(nodeRequire: NodeRequire | undefined, filename: string | undefined): string | undefined {
-  if (!filename || !nodeRequire) {
+function getModule(filename: string | undefined): string | undefined {
+  if (!filename) {
     return;
   }
 
-  const base = `${
-    (nodeRequire.main && nodeRequire.main.filename && dirname(nodeRequire.main.filename)) || global.process.cwd()
-  }/`;
+  const base = `${(require?.main?.filename && dirname(require.main.filename)) || global.process.cwd()}/`;
 
   // It's specifically a module
   const file = basename(filename, '.js');
-  // eslint-disable-next-line no-param-reassign
-  filename = dirname(filename);
-  let n = filename.lastIndexOf('/node_modules/');
+
+  const path = dirname(filename);
+  let n = path.lastIndexOf('/node_modules/');
   if (n > -1) {
     // /node_modules/ is 14 chars
-    return `${filename.substr(n + 14).replace(/\//g, '.')}:${file}`;
+    return `${path.substr(n + 14).replace(/\//g, '.')}:${file}`;
   }
   // Let's see if it's a part of the main module
   // To be a part of main module, it has to share the same base
-  n = `${filename}/`.lastIndexOf(base, 0);
+  n = `${path}/`.lastIndexOf(base, 0);
 
   if (n === 0) {
-    let moduleName = filename.substr(base.length).replace(/\//g, '.');
+    let moduleName = path.substr(base.length).replace(/\//g, '.');
     if (moduleName) {
       moduleName += ':';
     }
@@ -37,83 +35,81 @@ function getModule(nodeRequire: NodeRequire | undefined, filename: string | unde
 const FILENAME_MATCH = /^\s*[-]{4,}$/;
 const FULL_MATCH = /at (?:(.+?)\s+\()?(?:(.+?):(\d+)(?::(\d+))?|([^)]+))\)?/;
 
-export const node = (nodeRequire: NodeRequire | undefined): StackLineParser => {
-  return (line: string) => {
-    if (line.match(FILENAME_MATCH)) {
-      return {
-        filename: line,
-      };
-    }
-
-    const lineMatch = line.match(FULL_MATCH);
-    if (!lineMatch) {
-      return undefined;
-    }
-
-    let object: string | undefined;
-    let method: string | undefined;
-    let functionName: string | undefined;
-    let typeName: string | undefined;
-    let methodName: string | undefined;
+export const node: StackLineParser = (line: string) => {
+  if (line.match(FILENAME_MATCH)) {
+    return {
+      filename: line,
+    };
+  }
 
-    if (lineMatch[1]) {
-      functionName = lineMatch[1];
+  const lineMatch = line.match(FULL_MATCH);
+  if (!lineMatch) {
+    return undefined;
+  }
 
-      let methodStart = functionName.lastIndexOf('.');
-      if (functionName[methodStart - 1] === '.') {
-        // eslint-disable-next-line no-plusplus
-        methodStart--;
-      }
+  let object: string | undefined;
+  let method: string | undefined;
+  let functionName: string | undefined;
+  let typeName: string | undefined;
+  let methodName: string | undefined;
 
-      if (methodStart > 0) {
-        object = functionName.substr(0, methodStart);
-        method = functionName.substr(methodStart + 1);
-        const objectEnd = object.indexOf('.Module');
-        if (objectEnd > 0) {
-          functionName = functionName.substr(objectEnd + 1);
-          object = object.substr(0, objectEnd);
-        }
-      }
-      typeName = undefined;
-    }
+  if (lineMatch[1]) {
+    functionName = lineMatch[1];
 
-    if (method) {
-      typeName = object;
-      methodName = method;
+    let methodStart = functionName.lastIndexOf('.');
+    if (functionName[methodStart - 1] === '.') {
+      // eslint-disable-next-line no-plusplus
+      methodStart--;
     }
 
-    if (method === '<anonymous>') {
-      methodName = undefined;
-      functionName = undefined;
+    if (methodStart > 0) {
+      object = functionName.substr(0, methodStart);
+      method = functionName.substr(methodStart + 1);
+      const objectEnd = object.indexOf('.Module');
+      if (objectEnd > 0) {
+        functionName = functionName.substr(objectEnd + 1);
+        object = object.substr(0, objectEnd);
+      }
     }
+    typeName = undefined;
+  }
 
-    let fn;
-    try {
-      fn = functionName || `${typeName}.${methodName || '<anonymous>'}`;
-    } catch (_) {
-      // This seems to happen sometimes when using 'use strict',
-      // stemming from `getTypeName`.
-      // [TypeError: Cannot read property 'constructor' of undefined]
-      fn = '<anonymous>';
-    }
+  if (method) {
+    typeName = object;
+    methodName = method;
+  }
 
-    const filename = lineMatch[2];
-    const isNative = lineMatch[5] === 'native';
-    const isInternal =
-      isNative || (filename && !filename.startsWith('/') && !filename.startsWith('.') && filename.indexOf(':\\') !== 1);
+  if (method === '<anonymous>') {
+    methodName = undefined;
+    functionName = undefined;
+  }
 
-    // in_app is all that's not an internal Node function or a module within node_modules
-    // note that isNative appears to return true even for node core libraries
-    // see https://github.com/getsentry/raven-node/issues/176
-    const in_app = !isInternal && filename !== undefined && !filename.includes('node_modules/');
+  let fn;
+  try {
+    fn = functionName || `${typeName}.${methodName || '<anonymous>'}`;
+  } catch (_) {
+    // This seems to happen sometimes when using 'use strict',
+    // stemming from `getTypeName`.
+    // [TypeError: Cannot read property 'constructor' of undefined]
+    fn = '<anonymous>';
+  }
 
-    return {
-      filename,
-      module: getModule(nodeRequire, filename),
-      function: fn,
-      lineno: parseInt(lineMatch[3], 10) || undefined,
-      colno: parseInt(lineMatch[4], 10) || undefined,
-      in_app,
-    };
+  const filename = lineMatch[2];
+  const isNative = lineMatch[5] === 'native';
+  const isInternal =
+    isNative || (filename && !filename.startsWith('/') && !filename.startsWith('.') && filename.indexOf(':\\') !== 1);
+
+  // in_app is all that's not an internal Node function or a module within node_modules
+  // note that isNative appears to return true even for node core libraries
+  // see https://github.com/getsentry/raven-node/issues/176
+  const in_app = !isInternal && filename !== undefined && !filename.includes('node_modules/');
+
+  return {
+    filename,
+    module: getModule(filename),
+    function: fn,
+    lineno: parseInt(lineMatch[3], 10) || undefined,
+    colno: parseInt(lineMatch[4], 10) || undefined,
+    in_app,
   };
 };