Skip to content

Commit a07228e

Browse files
committed
Fixup context-aware warn patch
nodejs/node#30336
1 parent 1507e67 commit a07228e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ index e7bd18855fb98a822833b4366bfb595dccfc1b6f..a96f891f675cc598e912a5e010c24938
2323

2424
// TODO(joyeecheung): most of these should be deprecated and removed,
2525
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
26-
index 2fddd3766ffb28dc9176ed1b7a4b01361dd72fcd..c14cbe0279bbce98ea875bc3487996da679b4f40 100644
26+
index 38f4d277a51e3c3ff6d1fe37128e975b888207f0..b21a3e12e7b9dd49e0ffb7ef6495443ecb1d156f 100644
2727
--- a/lib/internal/modules/cjs/loader.js
2828
+++ b/lib/internal/modules/cjs/loader.js
29-
@@ -932,6 +932,13 @@ Module.prototype._compile = function(content, filename) {
29+
@@ -1128,6 +1128,13 @@ Module.prototype._compile = function(content, filename) {
3030
if (getOptionValue('--inspect-brk') && process._eval == null) {
3131
if (!resolvedArgv) {
3232
// We enter the repl if we're not given a filename argument.
@@ -38,8 +38,8 @@ index 2fddd3766ffb28dc9176ed1b7a4b01361dd72fcd..c14cbe0279bbce98ea875bc3487996da
3838
+ delete process._firstFileName
3939
+ } else
4040
if (process.argv[1]) {
41-
resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
42-
} else {
41+
try {
42+
resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
4343
diff --git a/src/env.h b/src/env.h
4444
index 60cb1b6d113e7e0687d96806f8940b5a715144cf..eef7b7bc244b4231419b4ec3013fa1cf700c97ef 100644
4545
--- a/src/env.h

0 commit comments

Comments
 (0)