From 1b64de21304e32610a6d9ada60f4918df819a139 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 22 Sep 2022 16:33:30 +0200 Subject: [PATCH] Revert "fix(remix): Use `import()` to get `react-router-dom` in Express wrapper. (#5796)" This reverts commit 1f3da818f6216214f293992ad17e7a3ddffe2b00. --- packages/remix/src/utils/serverAdapters/express.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/remix/src/utils/serverAdapters/express.ts b/packages/remix/src/utils/serverAdapters/express.ts index 6989f3c3e0f0..f3d3a7218281 100644 --- a/packages/remix/src/utils/serverAdapters/express.ts +++ b/packages/remix/src/utils/serverAdapters/express.ts @@ -2,8 +2,7 @@ import { getCurrentHub } from '@sentry/hub'; import { flush } from '@sentry/node'; import { hasTracingEnabled } from '@sentry/tracing'; import { Transaction } from '@sentry/types'; -import { extractRequestData, isString, logger } from '@sentry/utils'; -import { cwd } from 'process'; +import { extractRequestData, isString, loadModule, logger } from '@sentry/utils'; import { createRoutes, @@ -19,6 +18,7 @@ import { ExpressRequest, ExpressRequestHandler, ExpressResponse, + ReactRouterDomPkg, ServerBuild, } from '../types'; @@ -27,8 +27,7 @@ function wrapExpressRequestHandler( build: ServerBuild, ): ExpressRequestHandler { const routes = createRoutes(build.routes); - // eslint-disable-next-line @typescript-eslint/no-var-requires - const pkg = require(`${cwd()}/node_modules/react-router-dom`); + const pkg = loadModule('react-router-dom'); // If the core request handler is already wrapped, don't wrap Express handler which uses it. if (isRequestHandlerWrapped) {