chore: remove overwritten Node.js patch (#24775)
* chore: remove overwritten Node.js patch * update patches Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
parent
e5c721eafc
commit
6fd302f745
3 changed files with 2 additions and 33 deletions
|
@ -13,7 +13,6 @@ feat_add_flags_for_low-level_hooks_and_exceptions.patch
|
||||||
fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
|
fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
|
||||||
pass_all_globals_through_require.patch
|
pass_all_globals_through_require.patch
|
||||||
call_process_log_from_fallback_stream_on_windows.patch
|
call_process_log_from_fallback_stream_on_windows.patch
|
||||||
fixme_use_redefined_version_of_internalmodulestat.patch
|
|
||||||
fixme_remove_async_id_assertion_check.patch
|
fixme_remove_async_id_assertion_check.patch
|
||||||
fixme_comment_trace_event_macro.patch
|
fixme_comment_trace_event_macro.patch
|
||||||
fix_key_gen_apis_are_not_available_in_boringssl.patch
|
fix_key_gen_apis_are_not_available_in_boringssl.patch
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
||||||
Date: Wed, 21 Aug 2019 11:06:16 -0700
|
|
||||||
Subject: FIXME: use redefined version of internalModuleStat
|
|
||||||
|
|
||||||
Instantiate redefined version of the internalModuleStat function
|
|
||||||
(see lib/common/asar.js in the electron/electron repo). For some reason
|
|
||||||
this has to be done after the upgrade to the Node.js v8.7.0. in the very beginning of the file holds a reference
|
|
||||||
to a native Node.js implementation of the function.
|
|
||||||
|
|
||||||
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
|
|
||||||
index 0ef46569924354ea3ef59f3220637e30b316a761..44271058a26dc05b693e07aad9a22037dd9a5d1f 100644
|
|
||||||
--- a/lib/internal/modules/cjs/loader.js
|
|
||||||
+++ b/lib/internal/modules/cjs/loader.js
|
|
||||||
@@ -142,6 +142,8 @@ function enrichCJSError(err) {
|
|
||||||
}
|
|
||||||
|
|
||||||
function stat(filename) {
|
|
||||||
+ // FIXME(codebytere): determine why this needs to be done and remove
|
|
||||||
+ const internalModuleStat = process.binding('fs').internalModuleStat;
|
|
||||||
filename = path.toNamespacedPath(filename);
|
|
||||||
if (statCache !== null) {
|
|
||||||
const result = statCache.get(filename);
|
|
|
@ -22,7 +22,7 @@ index c872941b974216d94863bcbf0e597b9c09ca50e2..4e7c3c10255a0eae4d5333f88e51cf71
|
||||||
process.config = JSONParse(internalBinding('native_module').config);
|
process.config = JSONParse(internalBinding('native_module').config);
|
||||||
|
|
||||||
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
|
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
|
||||||
index 44271058a26dc05b693e07aad9a22037dd9a5d1f..7d08fb05e9a0abeb82d416891968b23002dc3685 100644
|
index 0ef46569924354ea3ef59f3220637e30b316a761..7d08fb05e9a0abeb82d416891968b23002dc3685 100644
|
||||||
--- a/lib/internal/modules/cjs/loader.js
|
--- a/lib/internal/modules/cjs/loader.js
|
||||||
+++ b/lib/internal/modules/cjs/loader.js
|
+++ b/lib/internal/modules/cjs/loader.js
|
||||||
@@ -55,7 +55,7 @@ const assert = require('internal/assert');
|
@@ -55,7 +55,7 @@ const assert = require('internal/assert');
|
||||||
|
@ -34,14 +34,7 @@ index 44271058a26dc05b693e07aad9a22037dd9a5d1f..7d08fb05e9a0abeb82d416891968b230
|
||||||
const packageJsonReader = require('internal/modules/package_json_reader');
|
const packageJsonReader = require('internal/modules/package_json_reader');
|
||||||
const { safeGetenv } = internalBinding('credentials');
|
const { safeGetenv } = internalBinding('credentials');
|
||||||
const {
|
const {
|
||||||
@@ -142,14 +142,12 @@ function enrichCJSError(err) {
|
@@ -147,7 +147,7 @@ function stat(filename) {
|
||||||
}
|
|
||||||
|
|
||||||
function stat(filename) {
|
|
||||||
- // FIXME(codebytere): determine why this needs to be done and remove
|
|
||||||
- const internalModuleStat = process.binding('fs').internalModuleStat;
|
|
||||||
filename = path.toNamespacedPath(filename);
|
|
||||||
if (statCache !== null) {
|
|
||||||
const result = statCache.get(filename);
|
const result = statCache.get(filename);
|
||||||
if (result !== undefined) return result;
|
if (result !== undefined) return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue