From 4a03486c95b9f68f6a3dbab6032bcdcfd1e8f336 Mon Sep 17 00:00:00 2001 From: Sergey Chernyshev Date: Thu, 25 Apr 2024 01:45:56 +0200 Subject: [PATCH] bootstrap: include event_target into the built-in snapshot Since the module has to be loaded during bootstrap anyway. PR-URL: https://github.com/nodejs/node/pull/45849 Backport-PR-URL: https://github.com/nodejs/node/pull/46425 Reviewed-By: Geoffrey Booth Reviewed-By: Chengzhong Wu --- graal-nodejs/lib/internal/bootstrap/browser.js | 8 +++++--- graal-nodejs/test/parallel/test-bootstrap-modules.js | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/graal-nodejs/lib/internal/bootstrap/browser.js b/graal-nodejs/lib/internal/bootstrap/browser.js index 93ae26f77a1..9e63e0679ac 100644 --- a/graal-nodejs/lib/internal/bootstrap/browser.js +++ b/graal-nodejs/lib/internal/bootstrap/browser.js @@ -42,9 +42,11 @@ defineOperation(globalThis, 'setTimeout', timers.setTimeout); exposeLazyInterfaces(globalThis, 'internal/abort_controller', [ 'AbortController', 'AbortSignal', ]); -exposeLazyInterfaces(globalThis, 'internal/event_target', [ - 'EventTarget', 'Event', -]); +const { + EventTarget, Event, +} = require('internal/event_target'); +exposeInterface(globalThis, 'Event', Event); +exposeInterface(globalThis, 'EventTarget', EventTarget); exposeLazyInterfaces(globalThis, 'internal/worker/io', [ 'MessageChannel', 'MessagePort', 'MessageEvent', ]); diff --git a/graal-nodejs/test/parallel/test-bootstrap-modules.js b/graal-nodejs/test/parallel/test-bootstrap-modules.js index 2b98ffa8c19..4122d2a2129 100644 --- a/graal-nodejs/test/parallel/test-bootstrap-modules.js +++ b/graal-nodejs/test/parallel/test-bootstrap-modules.js @@ -46,6 +46,7 @@ const expectedModules = new Set([ 'NativeModule internal/constants', 'NativeModule internal/dns/utils', 'NativeModule internal/errors', + 'NativeModule internal/event_target', 'NativeModule internal/fixed_queue', 'NativeModule internal/fs/utils', 'NativeModule internal/graal/buffer', @@ -91,6 +92,7 @@ const expectedModules = new Set([ 'NativeModule internal/vm', 'NativeModule internal/vm/module', 'NativeModule internal/wasm_web_api', + 'NativeModule internal/webidl', 'NativeModule internal/worker/js_transferable', 'Internal Binding blob', 'NativeModule async_hooks', @@ -100,6 +102,7 @@ const expectedModules = new Set([ 'NativeModule url', 'NativeModule internal/v8/startup_snapshot', 'NativeModule vm', + 'NativeModule util', ]); if (!common.isMainThread) {