Skip to content

fix: improved windows tracing support #2240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kirrg001 wants to merge 1 commit into
base: main
Choose a base branch
from
+561 −4
Open

fix: improved windows tracing support #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/core/src/util/requireHook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,21 @@ function patchedModuleLoad(moduleName) {
// However, when an ESM library imports a CommonJS package, our requireHook is triggered.
// For native ESM libraries the iitmHook is triggered.
if (path.isAbsolute(moduleName) && ['.node', '.json', '.ts'].indexOf(path.extname(moduleName)) === -1) {
// CASE: normalize windows paths (backslashes)
const normalizedModuleName = moduleName.replace(/\\/g, '/');

// EDGE CASE for ESM: mysql2/promise.js
if (moduleName.indexOf('node_modules/mysql2/promise.js') !== -1) {
if (normalizedModuleName.indexOf('node_modules/mysql2/promise.js') !== -1) {
moduleName = 'mysql2/promise';
} else {
// e.g. path is node_modules/@elastic/elasicsearch/index.js
let match = moduleName.match(/node_modules\/(@.*?(?=\/)\/.*?(?=\/))/);
let match = normalizedModuleName.match(/node_modules\/(@.*?(?=\/)\/.*?(?=\/))/);

if (match && match.length > 1) {
moduleName = match[1];
} else {
// e.g. path is node_modules/mysql/lib/index.js
match = moduleName.match(/node_modules\/(.*?(?=\/))/);
match = normalizedModuleName.match(/node_modules\/(.*?(?=\/))/);

if (match && match.length > 1) {
moduleName = match[1];
Expand Down Expand Up @@ -145,8 +148,11 @@ function patchedModuleLoad(moduleName) {
}

if (!cacheEntry.byFileNamePatternTransformersApplied) {
// CASE: normalize windows paths (backslashes)
const normalizedFilename = filename.replace(/\\/g, '/');

for (let i = 0; i < byFileNamePatternTransformers.length; i++) {
if (byFileNamePatternTransformers[i].pattern.test(filename)) {
if (byFileNamePatternTransformers[i].pattern.test(normalizedFilename)) {
cacheEntry.moduleExports =
byFileNamePatternTransformers[i].fn(cacheEntry.moduleExports, filename) || cacheEntry.moduleExports;
}
Expand Down
Loading