From debb4bff6a2aaaeee92daf6a456927245f1a4afc Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 14 Jul 2020 20:19:49 -0700 Subject: [PATCH] Add patch removal plan --- ...ot_register_the_esm_loader_in_renderer_processes.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/patches/node/fix_do_not_register_the_esm_loader_in_renderer_processes.patch b/patches/node/fix_do_not_register_the_esm_loader_in_renderer_processes.patch index 5a6441548e86a..5dd6c2e95761d 100644 --- a/patches/node/fix_do_not_register_the_esm_loader_in_renderer_processes.patch +++ b/patches/node/fix_do_not_register_the_esm_loader_in_renderer_processes.patch @@ -5,7 +5,13 @@ Subject: fix: do not register the ESM loader in renderer processes Only one ESM loader can be registered per isolate, in renderer processes this should be blink. This patches node so that it won't register it's handler (overriding blinks) in non-browser processes. -This can be attempted to be upstreamed as a new option --disable-esm-loader or something similar. +This has been upstreamed in: + * https://github.com/nodejs/node/pull/34060 + * https://github.com/nodejs/node/pull/34127 + +We can't easily rebase on that accepted solution here but we can as soon as we upgrade to +Node.js v14, since we need to leverage the new version of node::CreateEnvironment +introduced in https://github.com/nodejs/node/pull/30467. diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js index b4a0f71af5853f427a10449b52509052fbe3facd..ba5b0b6e51bcddbc5b9dd9c31231585d61b131a0 100644