From c5fdaf4386de255c5095aa645bc081b702ccb713 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Sun, 5 Nov 2023 17:24:32 -0800 Subject: [PATCH] lib: fix BroadcastChannel initialization location https://github.com/nodejs/node/pull/46864 --- patches/node/.patches | 1 - ...dcastchannel_initialization_location.patch | 44 ------------------- 2 files changed, 45 deletions(-) delete mode 100644 patches/node/lib_fix_broadcastchannel_initialization_location.patch diff --git a/patches/node/.patches b/patches/node/.patches index 37f83ae9fcc35..f9343baffcb3e 100644 --- a/patches/node/.patches +++ b/patches/node/.patches @@ -36,7 +36,6 @@ fix_ftbfs_werror_wextra-semi.patch ci_ensure_node_tests_set_electron_run_as_node.patch fix_assert_module_in_the_renderer_process.patch fix_add_trusted_space_and_trusted_lo_space_to_the_v8_heap.patch -lib_fix_broadcastchannel_initialization_location.patch src_adapt_to_v8_exception_api_change.patch lib_test_do_not_hardcode_buffer_kmaxlength.patch fix_handle_possible_disabled_sharedarraybuffer.patch diff --git a/patches/node/lib_fix_broadcastchannel_initialization_location.patch b/patches/node/lib_fix_broadcastchannel_initialization_location.patch deleted file mode 100644 index 4a53a3b2457dc..0000000000000 --- a/patches/node/lib_fix_broadcastchannel_initialization_location.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shelley Vohr -Date: Mon, 27 Feb 2023 12:56:15 +0100 -Subject: lib: fix BroadcastChannel initialization location - -Refs https://github.com/nodejs/node/pull/40532. - -Fixes a bug in the above, wherein BroadcastChannel should have been -initialized in bootstrap/browser instead of bootstrap/node. That -inadvertently made it such that there was incorrect handling of the -DOM vs Node.js implementations of BroadcastChannel. - -This will be upstreamed. - -diff --git a/lib/internal/bootstrap/browser.js b/lib/internal/bootstrap/browser.js -index 5be4dd6176482c724455cbbeeaa9680e849a091b..29ccee75d77da072735032f0a25363ac88a023ba 100644 ---- a/lib/internal/bootstrap/browser.js -+++ b/lib/internal/bootstrap/browser.js -@@ -12,6 +12,10 @@ const { - } = require('internal/util'); - const config = internalBinding('config'); - -+// Non-standard extensions: -+const { BroadcastChannel } = require('internal/worker/io'); -+exposeInterface(globalThis, 'BroadcastChannel', BroadcastChannel); -+ - // https://console.spec.whatwg.org/#console-namespace - exposeNamespace(globalThis, 'console', - createGlobalConsole()); -diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js -index 13ea68c96fd415f976aab0f291a1b7c688db1c58..0ca3de08fffb344c0330ce0f8d28b2d3d0b24350 100644 ---- a/lib/internal/bootstrap/node.js -+++ b/lib/internal/bootstrap/node.js -@@ -238,10 +238,6 @@ const { - queueMicrotask, - } = require('internal/process/task_queues'); - --// Non-standard extensions: --const { BroadcastChannel } = require('internal/worker/io'); --exposeInterface(globalThis, 'BroadcastChannel', BroadcastChannel); -- - defineOperation(globalThis, 'queueMicrotask', queueMicrotask); - - const timers = require('timers');