diff --git a/quickjs/CMakeLists.txt b/quickjs/CMakeLists.txt index 9f83a39..8e16f59 100644 --- a/quickjs/CMakeLists.txt +++ b/quickjs/CMakeLists.txt @@ -17,14 +17,6 @@ set(NAPI_QUICKJS_ROOT "${CMAKE_CURRENT_SOURCE_DIR}") # include("${NAPI_V8_ROOT}/cmake/NapiEngine.cmake") # include("${NAPI_V8_ROOT}/cmake/NapiV8Resolver.cmake") # napi_engine_set_layout("${NAPI_V8_ROOT}") -# set(NAPI_V8_NODE_ROOT_DEFAULT "${PROJECT_ROOT}/node") -# if(DEFINED ENV{NAPI_V8_NODE_ROOT}) -# set(NAPI_V8_NODE_ROOT_DEFAULT "$ENV{NAPI_V8_NODE_ROOT}") -# endif() -# set(NAPI_V8_NODE_ROOT -# "${NAPI_V8_NODE_ROOT_DEFAULT}" -# CACHE PATH "Path to Node source root (for raw Node tests/fixtures)" -# ) # napi_v8_resolve_configuration() include("${NAPI_QUICKJS_ROOT}/cmake/NapiEngine.cmake") diff --git a/quickjs/deps/quickjs b/quickjs/deps/quickjs index cec4427..14bf204 160000 --- a/quickjs/deps/quickjs +++ b/quickjs/deps/quickjs @@ -1 +1 @@ -Subproject commit cec44274d0b0abb9670e978a32ed4b4c2dd3b0bd +Subproject commit 14bf204368c94862b6e82b728de69bf4cb6cc350 diff --git a/quickjs/src/internal/napi_contextify.cc b/quickjs/src/internal/napi_contextify.cc index ccadc15..d4ac04c 100644 --- a/quickjs/src/internal/napi_contextify.cc +++ b/quickjs/src/internal/napi_contextify.cc @@ -817,9 +817,9 @@ namespace quickjs::detail napi_env_context_scope__ child_scope{env_, record->ctx}; JSEvalOptions options{ .version = JS_EVAL_OPTIONS_VERSION, + .eval_flags = JS_EVAL_TYPE_GLOBAL, .filename = label.c_str(), .line_num = std::max(1, line_offset + 1), - .eval_flags = JS_EVAL_TYPE_GLOBAL, }; result = JS_EvalThis2(record->ctx, record->global, src.c_str(), src.size(), &options); if (JS_IsException(result)) diff --git a/v8/CMakeLists.txt b/v8/CMakeLists.txt index 3830d2d..c5fa182 100644 --- a/v8/CMakeLists.txt +++ b/v8/CMakeLists.txt @@ -16,14 +16,6 @@ napi_enable_sccache_if_available() include("${NAPI_V8_ROOT}/cmake/NapiEngine.cmake") include("${NAPI_V8_ROOT}/cmake/NapiV8Resolver.cmake") napi_engine_set_layout("${NAPI_V8_ROOT}") -set(NAPI_V8_NODE_ROOT_DEFAULT "${PROJECT_ROOT}/node") -if(DEFINED ENV{NAPI_V8_NODE_ROOT}) - set(NAPI_V8_NODE_ROOT_DEFAULT "$ENV{NAPI_V8_NODE_ROOT}") -endif() -set(NAPI_V8_NODE_ROOT - "${NAPI_V8_NODE_ROOT_DEFAULT}" - CACHE PATH "Path to Node source root (for raw Node tests/fixtures)" -) napi_v8_resolve_configuration() file(GLOB_RECURSE NAPI_V8_SRC_FILES