diff options
| author | Matt Mastracci <matthew@mastracci.com> | 2023-06-14 10:45:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 16:45:59 +0000 |
| commit | 88e6e9c1e6263f326d30b7fcc33465e0428faf33 (patch) | |
| tree | 956e60abea884d89e4c76cc792e2b3159317278e /runtime/worker.rs | |
| parent | cd27757184e683575c2540f73a96dc96e268943a (diff) | |
refactor(core): some runtime methods should live on the module map (#19502)
A few easy migrations of module code from the runtime to the module map.
The module map already has a few places where it needs a handle scope,
so we're not coupling it any further with the v8 runtime.
`init_runtime_module_map` is replaced with an option to reduce API
surface of JsRuntime.
`module_resolve_callback` now lives in the `ModuleMap` and we use a
annex data to avoid having to go through the `Rc<RefCell<...>>` stored
in the `JsRuntime`'s isolate.
Diffstat (limited to 'runtime/worker.rs')
| -rw-r--r-- | runtime/worker.rs | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/runtime/worker.rs b/runtime/worker.rs index 10375818d..0293c332a 100644 --- a/runtime/worker.rs +++ b/runtime/worker.rs @@ -58,16 +58,6 @@ impl ExitCode { } } -/// Clear extension modules from the module map, except preserve `ext:deno_node` -/// modules as `node:` specifiers. -pub fn init_runtime_module_map(js_runtime: &mut JsRuntime) { - js_runtime.clear_module_map( - deno_node::SUPPORTED_BUILTIN_NODE_MODULES - .iter() - .map(|p| (p.ext_specifier, p.specifier)), - ); -} - /// This worker is created and used by almost all /// subcommands in Deno executable. /// @@ -323,6 +313,15 @@ impl MainWorker { let startup_snapshot = options.startup_snapshot .expect("deno_runtime startup snapshot is not available with 'create_runtime_snapshot' Cargo feature."); + // Clear extension modules from the module map, except preserve `ext:deno_node` + // modules as `node:` specifiers. + let rename_modules = Some( + deno_node::SUPPORTED_BUILTIN_NODE_MODULES + .iter() + .map(|p| (p.ext_specifier, p.specifier)) + .collect(), + ); + let mut js_runtime = JsRuntime::new(RuntimeOptions { module_loader: Some(options.module_loader.clone()), startup_snapshot: Some(startup_snapshot), @@ -332,11 +331,11 @@ impl MainWorker { shared_array_buffer_store: options.shared_array_buffer_store.clone(), compiled_wasm_module_store: options.compiled_wasm_module_store.clone(), extensions, + rename_modules, inspector: options.maybe_inspector_server.is_some(), is_main: true, ..Default::default() }); - init_runtime_module_map(&mut js_runtime); if let Some(server) = options.maybe_inspector_server.clone() { server.register_inspector( |