Skip to content

Commit 1d3384b

Browse files
committed
src: add internal binding for constructing SharedArrayBuffers
nodejs/node#60497
1 parent 583538b commit 1d3384b

3 files changed

Lines changed: 3 additions & 67 deletions

File tree

‎patches/node/.patches‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ fix_redefined_macos_sdk_header_symbols.patch
3636
fix_allow_disabling_fetch_in_renderer_and_worker_processes.patch
3737
feat_disable_js_source_phase_imports_by_default.patch
3838
fix_avoid_external_memory_leak_on_invalid_tls_protocol_versions.patch
39-
lib_check_sharedarraybuffer_existence_in_fast-utf8-stream.patch
4039
api_delete_deprecated_fields_on_v8_isolate.patch
4140
api_promote_deprecation_of_v8_context_and_v8_object_api_methods.patch
4241
fix_ensure_traverseparent_bails_on_resource_path_exit.patch

‎patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,15 @@ index c284163fba86ec820af1996571fbd3d092d41d34..5f1921d15bc1d3a68c35990f85e36a0e
6464
}
6565
}
6666
diff --git a/lib/internal/modules/esm/loader.js b/lib/internal/modules/esm/loader.js
67-
index abfe88c272dcc4aa1e95948bf754f55e1df74ddf..d8e8e6ec291f9eab039e2d31a3566f645bdc0d9c 100644
67+
index abfe88c272dcc4aa1e95948bf754f55e1df74ddf..7a29cd391fdf050ebda50c5b2f263d27001ced74 100644
6868
--- a/lib/internal/modules/esm/loader.js
6969
+++ b/lib/internal/modules/esm/loader.js
70-
@@ -437,7 +437,15 @@ class ModuleLoader {
70+
@@ -437,7 +437,7 @@ class ModuleLoader {
7171
assert(wrap instanceof ModuleWrap, `Translator used for require(${url}) should not be async`);
7272

7373
const cjsModule = wrap[imported_cjs_symbol];
74-
+<<<<<<< HEAD
74+
- if (cjsModule) {
7575
+ if (cjsModule && translatorKey !== 'electron') {
76-
+||||||| constructed fake ancestor
77-
if (cjsModule) {
78-
+ assert(translatorKey === 'commonjs-sync');
79-
+=======
80-
+ if (cjsModule && translatorKey !== 'electron') {
81-
+ assert(translatorKey === 'commonjs-sync');
82-
+>>>>>>> fix: expose the built-in electron module via the ESM loader
8376
// Check if the ESM initiating import CJS is being required by the same CJS module.
8477
if (cjsModule?.[kIsExecuting]) {
8578
const parentFilename = urlToFilename(parentURL);

‎patches/node/lib_check_sharedarraybuffer_existence_in_fast-utf8-stream.patch‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)