Attempt to fix asar support

electron · Apr 10, 2019 · 152f200 · 152f200
1 parent ffd1b08
commit 152f200
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -188,6 +188,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/node.js b/lib/internal/bootstrap/node.js
@@ -40,14 +40,11 @@ const { Object, Symbol } = primordials;
 const config = internalBinding('config');
 const { deprecate } = require('internal/util');
 
-process.NativeModule = NativeModule;
 setupProcessObject();
 
 setupGlobalProxy();
 setupBuffer();
 
-setupAsarSupport();
-
 process.domain = null;
 process._exiting = false;
 
@@ -450,7 +447,3 @@ function defineOperation(target, name, method) {
     value: method
   });
 }
-
-function setupAsarSupport() {
-  process._linkedBinding('atom_common_asar').initAsarSupport(NativeModule._source, NativeModule.require);
-}
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -45,6 +45,7 @@ function prepareMainThreadExecution() {
   initializeFrozenIntrinsics();
   initializeESMLoader();
   loadPreloadModules();
+  setupAsarSupport();
 }
 
 function patchProcessObject() {
@@ -315,6 +316,10 @@ function loadPreloadModules() {
   }
 }
 
+function setupAsarSupport() {
+  process._linkedBinding('atom_common_asar').initAsarSupport(require);
+}
+
 module.exports = {
   patchProcessObject,
   setupCoverageHooks,