From 55bb7782ec46e365c331730c83a9318ae88562a8 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 12 Feb 2020 08:35:25 -0800 Subject: [PATCH] Fixup asar support setup patch https://github.com/nodejs/node/pull/30862 --- .../node/feat_initialize_asar_support.patch | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/patches/node/feat_initialize_asar_support.patch b/patches/node/feat_initialize_asar_support.patch index 052bfb799e094..685630b31ef0d 100644 --- a/patches/node/feat_initialize_asar_support.patch +++ b/patches/node/feat_initialize_asar_support.patch @@ -3,34 +3,21 @@ From: Shelley Vohr Date: Thu, 13 Sep 2018 08:56:07 -0700 Subject: feat: initialize asar support -This patch initializies asar support in Node.js. +This patch initializes asar support in Node.js. -diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js -index 0cad5209c4ff4e68d7c400af1d2b4c234210ddb4..918bc8c0c4e78bad5a3372e8a5522da00aa9073e 100644 ---- a/lib/internal/bootstrap/loaders.js -+++ b/lib/internal/bootstrap/loaders.js -@@ -192,6 +192,8 @@ function nativeModuleRequire(id) { - return mod.compile(); - } - -+NativeModule.require = nativeModuleRequire -+ - NativeModule.exists = function(id) { - return NativeModule.map.has(id); - }; diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js -index 2aa2a3b46c5fc12d22e0e74e304d2d55ca02c3b5..c86b5851ca9332ca440443e5feab2e65c7ac30b9 100644 +index 1b05d6e30a0ba004ac3c1113da3ad649a6e74dcc..2fc1151251571db91e01725353af2c8ff41af018 100644 --- a/lib/internal/bootstrap/pre_execution.js +++ b/lib/internal/bootstrap/pre_execution.js -@@ -61,6 +61,7 @@ function prepareMainThreadExecution(expandArgv1 = false) { - initializeESMLoader(); +@@ -67,6 +67,7 @@ function prepareMainThreadExecution(expandArgv1 = false) { + assert(!CJSLoader.hasLoadedAnyUserCJSModule); loadPreloadModules(); initializeFrozenIntrinsics(); + setupAsarSupport(); } function patchProcessObject(expandArgv1) { -@@ -444,6 +445,10 @@ function loadPreloadModules() { +@@ -445,6 +446,10 @@ function loadPreloadModules() { } }