fix: dynamicRequire pass in module (#1687)

Author: HazAT

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- [utils]: `bundlerSafeRequire` renamed to `dynamicRequire` now takes two arguments, first is should be `module`, second `request` / `moduleName`.
+
 ## 4.2.2
 
 - [core]: Several internal fixes regarding integration, exports and domain.

packages/hub/src/hub.ts

@@ -8,7 +8,7 @@ import {
   Severity,
 } from '@sentry/types';
 import { logger } from '@sentry/utils/logger';
-import { bundlerSafeRequire, getGlobalObject, uuid4 } from '@sentry/utils/misc';
+import { dynamicRequire, getGlobalObject, uuid4 } from '@sentry/utils/misc';
 import { Carrier, Layer } from './interfaces';
 import { Scope } from './scope';
 
@@ -334,10 +334,10 @@ export function getCurrentHub(): Hub {
 
   // Prefer domains over global if they are there
   try {
-    // We need to use `bundlerSafeRequire` because `require` on it's own will be optimized by webpack.
-    // We do not want this to happen, we need to try `require` the domain node module and fail if we are in browser
+    // We need to use `dynamicRequire` because `require` on it's own will be optimized by webpack.
+    // We do not want this to happen, we need to try to `require` the domain node module and fail if we are in browser
     // for example so we do not have to shim it and use `getCurrentHub` universally.
-    const domain = bundlerSafeRequire('domain');
+    const domain = dynamicRequire(module, 'domain');
     const activeDomain = domain.active;
 
     // If there no active domain, just return global hub

packages/node/package.json

@@ -48,8 +48,10 @@
     "fix": "run-s fix:tslint fix:prettier",
     "fix:prettier": "prettier --write '{src,test}/**/*.ts'",
     "fix:tslint": "tslint --fix -t stylish -p .",
-    "test": "jest",
+    "test": "run-s test:jest test:express",
+    "test:jest": "jest",
     "test:watch": "jest --watch --notify",
+    "test:express": "node test/manual/express.js",
     "version": "node ../../scripts/versionbump.js src/version.ts"
   },
   "jest": {

packages/utils/README.md

@@ -19,4 +19,6 @@
 
 ## General
 
-Common utilities used by the Sentry JavaScript SDKs. **Warning, only submodule imports are allowed here.**
+Common utilities used by the Sentry JavaScript SDKs. **Warning, only submodule imports are allowed here.** Also note,
+this function shouldn't be used externally, we will break them from time to time. This package is not part of our public
+API contract, we use them only internally.

packages/utils/src/misc.ts

@@ -6,11 +6,8 @@ import { isString } from './is';
  *
  * @param request The module path to resolve
  */
-export function bundlerSafeRequire(request: string): any {
-  // We need to do this check for global.module || module here because if we are calling this inside a
-  // active domain, global.module is undefined.
-  // tslint:disable-next-line
-  return ((getGlobalObject() as any).module || module).require(request);
+export function dynamicRequire(mod: NodeModule, request: string): any {
+  return mod.require(request);
 }
 
 /**