From 0ba696e976d9031110e995995e7e5ac33c03f91c Mon Sep 17 00:00:00 2001 From: bruce-one Date: Sun, 22 Nov 2020 09:20:38 +1100 Subject: [PATCH] fix: support for 12.19.1. (#835) --- src/patches/third-party-main.ts | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/patches/third-party-main.ts b/src/patches/third-party-main.ts index 53f1b48..0df36de 100644 --- a/src/patches/third-party-main.ts +++ b/src/patches/third-party-main.ts @@ -83,12 +83,22 @@ export default async function main(compiler: NexeCompiler, next: () => Promise StartMainThreadExecution(Environment* env) {', - 'MaybeLocal StartMainThreadExecution(Environment* env) {\n' + - ' return StartExecution(env, "internal/main/run_main_module");\n' - ) + const { contents: nodeccContents } = await compiler.readFileAsync('src/node.cc') + if (nodeccContents.includes('if (env->worker_context() != nullptr) {')) { + await compiler.replaceInFileAsync( + 'src/node.cc', + 'if (env->worker_context() != nullptr) {', + 'if (env->worker_context() == nullptr) {\n' + + ' return StartExecution(env, "internal/main/run_main_module"); } else {\n' + ) + } else { + await compiler.replaceInFileAsync( + 'src/node.cc', + 'MaybeLocal StartMainThreadExecution(Environment* env) {', + 'MaybeLocal StartMainThreadExecution(Environment* env) {\n' + + ' return StartExecution(env, "internal/main/run_main_module");\n' + ) + } } else { await compiler.setFileContentsAsync( 'lib/_third_party_main.js',