mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: remove electron.asar and embed JS in binary (#18577)

Browse source 
* refactor: remove electron.asar and embed JS in binary

* chore: update DEPS to merged node sha

* chore: remove unneeded eslint ignore
This commit is contained in:
Samuel Attard 2019-06-03 17:03:59 -07:00 • committed by GitHub
parent 901cdb22e3
commit 24b3d66767
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 44 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

18
atom/common/node_bindings.cc
View file

@ -307,25 +307,23 @@ node::Environment* NodeBindings::CreateEnvironment(
#endif
// Feed node the path to initialization script.
base::FilePath::StringType process_type;
std::string process_type;
switch (browser_env_) {
case BrowserEnvironment::BROWSER:
process_type = FILE_PATH_LITERAL("browser");
process_type = "browser";
break;
case BrowserEnvironment::RENDERER:
process_type = FILE_PATH_LITERAL("renderer");
process_type = "renderer";
break;
case BrowserEnvironment::WORKER:
process_type = FILE_PATH_LITERAL("worker");
process_type = "worker";
break;
}
base::FilePath resources_path =
GetResourcesPath(browser_env_ == BrowserEnvironment::BROWSER);
base::FilePath script_path =
resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
.Append(process_type)
.Append(FILE_PATH_LITERAL("init.js"));
args.insert(args.begin() + 1, script_path.AsUTF8Unsafe());
std::string init_script = "electron/js2c/" + process_type + "_init";
args.insert(args.begin() + 1, init_script);
std::unique_ptr<const char*[]> c_argv = StringVectorToArgArray(args);
node::Environment* env = node::CreateEnvironment(
@ -347,7 +345,7 @@ node::Environment* NodeBindings::CreateEnvironment(
process.Set("resourcesPath", resources_path);
// Do not set DOM globals for renderer process.
if (browser_env_ != BrowserEnvironment::BROWSER)
process.Set("_noBrowserGlobals", resources_path);
process.Set("_noBrowserGlobals", true);
// The path to helper app.
base::FilePath helper_exec_path;
base::PathService::Get(content::CHILD_PROCESS_EXE, &helper_exec_path);