Skip to content

module: improve detection try catch #52242

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

Closed
GeoffreyBooth wants to merge 9 commits into from
Closed

module: improve detection try catch #52242

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c7813df
module: improve detection try catch
GeoffreyBooth Mar 21, 2024
23adfbb
restore original enrichment location
GeoffreyBooth Mar 23, 2024
179152a
Move try/catch outside of flag
GeoffreyBooth Mar 23, 2024
0f28c7e
Update message tests
GeoffreyBooth Mar 23, 2024
b66b39e
Move error enrichment back; fix condition
GeoffreyBooth Mar 23, 2024
78ca8e3
update test fixture/snapshot stack traces
GeoffreyBooth Mar 28, 2024
a747816
update pseudo-tty snapshots
GeoffreyBooth Mar 28, 2024
060bf7e
Improve preserving entry point source so that we properly warn and de…
GeoffreyBooth Mar 28, 2024
d59bc95
lint
GeoffreyBooth Mar 28, 2024
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
Prev Previous commit
Next Next commit
Move error enrichment back; fix condition
  • Loading branch information
@GeoffreyBooth
GeoffreyBooth committed Mar 23, 2024
commit b66b39e100c40c00bd31a94b6c3d976514de7e99
2 changes: 0 additions & 2 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,8 +1342,6 @@ function wrapSafe(filename, content, cjsModuleInstance, codeCache) {
// For the main entry point, cache the source to potentially retry as ESM.
module.exports.entryPointSource = content;
}
const { enrichCJSError } = require('internal/modules/esm/translators');
enrichCJSError(err, content, filename);
}
throw err;
}
Expand Down
4 changes: 4 additions & 0 deletions lib/internal/modules/run_main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ function executeUserEntryPoint(main = process.argv[1]) {
}

if (!retryAsESM) {
if (Module === process.mainModule) {
const { enrichCJSError } = require('internal/modules/esm/translators');
enrichCJSError(error, source, resolvedMain);
}
return true; // Rethrow original exception.
}
});
Expand Down