Skip to content

Commit 028f4d5

Browse files
authored
fix(node): Use normal require call to import Undici (#10388)
1 parent 4285a7e commit 028f4d5

File tree

6 files changed

+385
-2541
lines changed

6 files changed

+385
-2541
lines changed

dev-packages/e2e-tests/test-applications/nextjs-14/app/request-instrumentation/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import http from 'http';
33
export const dynamic = 'force-dynamic';
44

55
export default async function Page() {
6-
await fetch('http://example.com/');
6+
await fetch('http://example.com/', { cache: 'no-cache' });
77
await new Promise<void>(resolve => {
88
http.get('http://example.com/', () => {
99
resolve();

packages/node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"test:express": "node test/manual/express-scope-separation/start.js",
6464
"test:jest": "jest",
6565
"test:release-health": "node test/manual/release-health/runner.js",
66-
"test:webpack": "cd test/manual/webpack-async-context/ && yarn --silent && node npm-build.js",
66+
"test:webpack": "cd test/manual/webpack-async-context/ && yarn --silent --ignore-engines && node npm-build.js",
6767
"test:watch": "jest --watch",
6868
"yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
6969
},

packages/node/src/integrations/undici/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
import type { EventProcessor, Integration, IntegrationFn, IntegrationFnResult, Span } from '@sentry/types';
1616
import {
1717
LRUMap,
18-
dynamicRequire,
1918
dynamicSamplingContextToSentryBaggageHeader,
2019
generateSentryTraceHeader,
2120
getSanitizedUrlString,
@@ -127,7 +126,7 @@ export class Undici implements Integration {
127126
let ds: DiagnosticsChannel | undefined;
128127
try {
129128
// eslint-disable-next-line @typescript-eslint/no-var-requires
130-
ds = dynamicRequire(module, 'diagnostics_channel') as DiagnosticsChannel;
129+
ds = require('diagnostics_channel') as DiagnosticsChannel;
131130
} catch (e) {
132131
// no-op
133132
}

packages/node/test/manual/webpack-async-context/npm-build.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ if (Number(process.versions.node.split('.')[0]) >= 18) {
77
process.exit(0);
88
}
99

10+
// Webpack test does not work in Node 8 and below.
11+
if (Number(process.versions.node.split('.')[0]) <= 8) {
12+
process.exit(0);
13+
}
14+
1015
// biome-ignore format: Follow-up for prettier
1116
webpack(
1217
{

packages/node/test/manual/webpack-async-context/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"main": "index.js",
55
"license": "MIT",
66
"dependencies": {
7-
"webpack": "^4.42.1"
7+
"webpack": "^5.90.0"
88
},
9-
"devDependencies": {
10-
"webpack-cli": "^3.3.11"
9+
"volta": {
10+
"extends": "../../../../../package.json"
1111
}
1212
}

0 commit comments

Comments
 (0)