Skip to content

Commit bdfb055

Browse files
JonasBaJonasBa
committed
ref: test module require
1 parent 489af9f commit bdfb055

File tree

2 files changed

+33
-34
lines changed

2 files changed

+33
-34
lines changed

‎packages/profiling-node/rollup.npm.config.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollu
33

44
export const ESMImportShim = `
55
import { createRequire } from 'node:module';
6-
const __sentry_require = createRequire(import.meta.url);
6+
const require = createRequire(import.meta.url);
77
`;
88

99
export const ESMRequireShim = `

‎packages/profiling-node/src/cpu_profiler.ts

+32-33
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import type { ProfileFormat } from './types';
1919
// When building for ESM, we shim require to use createRequire and __dirname.
2020
// We need to do this because .node extensions in esm are not supported.
2121
// The comment below this line exists as a placeholder for where to insert the shim
22-
const __sentry_require = require;
2322
// #END_SENTRY_ESM_SHIM // If a binary path is specified, use that.
2423

2524
const stdlib = familySync();
@@ -37,62 +36,62 @@ const built_from_source_path = resolve(__dirname, '..', `./sentry_cpu_profiler-$
3736
export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
3837
if (env['SENTRY_PROFILER_BINARY_PATH']) {
3938
const envPath = env['SENTRY_PROFILER_BINARY_PATH'];
40-
return __sentry_require(envPath);
39+
return require(envPath);
4140
}
4241

4342
// If a user specifies a different binary dir, they are in control of the binaries being moved there
4443
if (env['SENTRY_PROFILER_BINARY_DIR']) {
4544
const binaryPath = join(resolve(env['SENTRY_PROFILER_BINARY_DIR']), `sentry_cpu_profiler-${identifier}`);
46-
return __sentry_require(`${binaryPath}.node`);
45+
return require(`${binaryPath}.node`);
4746
}
4847

49-
// We need the fallthrough so that in the end, we can fallback to the __sentry_require dynamice require.
48+
// We need the fallthrough so that in the end, we can fallback to the require dynamice require.
5049
// This is for cases where precompiled binaries were not provided, but may have been compiled from source.
5150
if (platform === 'darwin') {
5251
if (arch === 'x64') {
5352
if (abi === '93') {
54-
return __sentry_require('../sentry_cpu_profiler-darwin-x64-93.node');
53+
return require('../sentry_cpu_profiler-darwin-x64-93.node');
5554
}
5655
if (abi === '108') {
57-
return __sentry_require('../sentry_cpu_profiler-darwin-x64-108.node');
56+
return require('../sentry_cpu_profiler-darwin-x64-108.node');
5857
}
5958
if (abi === '115') {
60-
return __sentry_require('../sentry_cpu_profiler-darwin-x64-115.node');
59+
return require('../sentry_cpu_profiler-darwin-x64-115.node');
6160
}
6261
if (abi === '127') {
63-
return __sentry_require('../sentry_cpu_profiler-darwin-x64-127.node');
62+
return require('../sentry_cpu_profiler-darwin-x64-127.node');
6463
}
6564
}
6665

6766
if (arch === 'arm64') {
6867
if (abi === '93') {
69-
return __sentry_require('../sentry_cpu_profiler-darwin-arm64-93.node');
68+
return require('../sentry_cpu_profiler-darwin-arm64-93.node');
7069
}
7170
if (abi === '108') {
72-
return __sentry_require('../sentry_cpu_profiler-darwin-arm64-108.node');
71+
return require('../sentry_cpu_profiler-darwin-arm64-108.node');
7372
}
7473
if (abi === '115') {
75-
return __sentry_require('../sentry_cpu_profiler-darwin-arm64-115.node');
74+
return require('../sentry_cpu_profiler-darwin-arm64-115.node');
7675
}
7776
if (abi === '127') {
78-
return __sentry_require('../sentry_cpu_profiler-darwin-arm64-127.node');
77+
return require('../sentry_cpu_profiler-darwin-arm64-127.node');
7978
}
8079
}
8180
}
8281

8382
if (platform === 'win32') {
8483
if (arch === 'x64') {
8584
if (abi === '93') {
86-
return __sentry_require('../sentry_cpu_profiler-win32-x64-93.node');
85+
return require('../sentry_cpu_profiler-win32-x64-93.node');
8786
}
8887
if (abi === '108') {
89-
return __sentry_require('../sentry_cpu_profiler-win32-x64-108.node');
88+
return require('../sentry_cpu_profiler-win32-x64-108.node');
9089
}
9190
if (abi === '115') {
92-
return __sentry_require('../sentry_cpu_profiler-win32-x64-115.node');
91+
return require('../sentry_cpu_profiler-win32-x64-115.node');
9392
}
9493
if (abi === '127') {
95-
return __sentry_require('../sentry_cpu_profiler-win32-x64-127.node');
94+
return require('../sentry_cpu_profiler-win32-x64-127.node');
9695
}
9796
}
9897
}
@@ -101,65 +100,65 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
101100
if (arch === 'x64') {
102101
if (stdlib === 'musl') {
103102
if (abi === '93') {
104-
return __sentry_require('../sentry_cpu_profiler-linux-x64-musl-93.node');
103+
return require('../sentry_cpu_profiler-linux-x64-musl-93.node');
105104
}
106105
if (abi === '108') {
107-
return __sentry_require('../sentry_cpu_profiler-linux-x64-musl-108.node');
106+
return require('../sentry_cpu_profiler-linux-x64-musl-108.node');
108107
}
109108
if (abi === '115') {
110-
return __sentry_require('../sentry_cpu_profiler-linux-x64-musl-115.node');
109+
return require('../sentry_cpu_profiler-linux-x64-musl-115.node');
111110
}
112111
if (abi === '127') {
113-
return __sentry_require('../sentry_cpu_profiler-linux-x64-musl-127.node');
112+
return require('../sentry_cpu_profiler-linux-x64-musl-127.node');
114113
}
115114
}
116115
if (stdlib === 'glibc') {
117116
if (abi === '93') {
118-
return __sentry_require('../sentry_cpu_profiler-linux-x64-glibc-93.node');
117+
return require('../sentry_cpu_profiler-linux-x64-glibc-93.node');
119118
}
120119
if (abi === '108') {
121-
return __sentry_require('../sentry_cpu_profiler-linux-x64-glibc-108.node');
120+
return require('../sentry_cpu_profiler-linux-x64-glibc-108.node');
122121
}
123122
if (abi === '115') {
124-
return __sentry_require('../sentry_cpu_profiler-linux-x64-glibc-115.node');
123+
return require('../sentry_cpu_profiler-linux-x64-glibc-115.node');
125124
}
126125
if (abi === '127') {
127-
return __sentry_require('../sentry_cpu_profiler-linux-x64-glibc-127.node');
126+
return require('../sentry_cpu_profiler-linux-x64-glibc-127.node');
128127
}
129128
}
130129
}
131130
if (arch === 'arm64') {
132131
if (stdlib === 'musl') {
133132
if (abi === '93') {
134-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-musl-93.node');
133+
return require('../sentry_cpu_profiler-linux-arm64-musl-93.node');
135134
}
136135
if (abi === '108') {
137-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-musl-108.node');
136+
return require('../sentry_cpu_profiler-linux-arm64-musl-108.node');
138137
}
139138
if (abi === '115') {
140-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-musl-115.node');
139+
return require('../sentry_cpu_profiler-linux-arm64-musl-115.node');
141140
}
142141
if (abi === '127') {
143-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-musl-127.node');
142+
return require('../sentry_cpu_profiler-linux-arm64-musl-127.node');
144143
}
145144
}
146145
if (stdlib === 'glibc') {
147146
if (abi === '93') {
148-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-glibc-93.node');
147+
return require('../sentry_cpu_profiler-linux-arm64-glibc-93.node');
149148
}
150149
if (abi === '108') {
151-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-glibc-108.node');
150+
return require('../sentry_cpu_profiler-linux-arm64-glibc-108.node');
152151
}
153152
if (abi === '115') {
154-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-glibc-115.node');
153+
return require('../sentry_cpu_profiler-linux-arm64-glibc-115.node');
155154
}
156155
if (abi === '127') {
157-
return __sentry_require('../sentry_cpu_profiler-linux-arm64-glibc-127.node');
156+
return require('../sentry_cpu_profiler-linux-arm64-glibc-127.node');
158157
}
159158
}
160159
}
161160
}
162-
return __sentry_require(`${built_from_source_path}.node`);
161+
return require(`${built_from_source_path}.node`);
163162
}
164163

165164
const PrivateCpuProfilerBindings: PrivateV8CpuProfilerBindings = importCppBindingsModule();

0 commit comments

Comments
 (0)