3 files changed, 23 insertions, 23 deletions

diff --git a/runtime/build.rs b/runtime/build.rs
index e5d0067a7..dd222a8a0 100644
--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -24,16 +24,23 @@ mod startup_snapshot {
   fn transpile_ts_for_snapshotting(
     file_source: &ExtensionFileSource,
   ) -> Result<ModuleCode, AnyError> {
-    let media_type = MediaType::from_path(Path::new(&file_source.specifier));
+    // Always transpile `node:` built-in modules, since they might be TypeScript.
+    let media_type = if file_source.specifier.starts_with("node:") {
+      MediaType::TypeScript
+    } else {
+      MediaType::from_path(Path::new(&file_source.specifier))
+    };
 
     let should_transpile = match media_type {
       MediaType::JavaScript => false,
       MediaType::Mjs => false,
       MediaType::TypeScript => true,
-      _ => panic!(
-        "Unsupported media type for snapshotting {media_type:?} for file {}",
-        file_source.specifier
-      ),
+      _ => {
+        panic!(
+          "Unsupported media type for snapshotting {media_type:?} for file {}",
+          file_source.specifier
+        )
+      }
     };
     let code = file_source.load()?;
 
@@ -284,7 +291,6 @@ mod startup_snapshot {
     runtime_main,
     deps = [runtime],
     customizer = |ext: &mut deno_core::ExtensionBuilder| {
-      eprintln!("I am here!!!");
       ext.esm_entry_point("ext:runtime/90_deno_ns.js");
     }
   );
diff --git a/runtime/web_worker.rs b/runtime/web_worker.rs
index 3efc98104..956181326 100644
--- a/runtime/web_worker.rs
+++ b/runtime/web_worker.rs
@@ -38,6 +38,7 @@ use deno_fs::FileSystem;
 use deno_http::DefaultHttpPropertyExtractor;
 use deno_io::Stdio;
 use deno_kv::sqlite::SqliteDbHandler;
+use deno_node::SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX;
 use deno_tls::RootCertStoreProvider;
 use deno_web::create_entangled_message_port;
 use deno_web::BlobStore;
@@ -484,14 +485,10 @@ impl WebWorker {
     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`
+    // Clear extension modules from the module map, except preserve `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 preserve_snapshotted_modules =
+      Some(SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX);
 
     let mut js_runtime = JsRuntime::new(RuntimeOptions {
       module_loader: Some(options.module_loader.clone()),
@@ -502,7 +499,7 @@ impl WebWorker {
       compiled_wasm_module_store: options.compiled_wasm_module_store.clone(),
       extensions,
       inspector: options.maybe_inspector_server.is_some(),
-      rename_modules,
+      preserve_snapshotted_modules,
       ..Default::default()
     });
 
diff --git a/runtime/worker.rs b/runtime/worker.rs
index 20fb6db84..d33cb2c80 100644
--- a/runtime/worker.rs
+++ b/runtime/worker.rs
@@ -34,6 +34,7 @@ use deno_fs::FileSystem;
 use deno_http::DefaultHttpPropertyExtractor;
 use deno_io::Stdio;
 use deno_kv::sqlite::SqliteDbHandler;
+use deno_node::SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX;
 use deno_tls::RootCertStoreProvider;
 use deno_web::BlobStore;
 use log::debug;
@@ -313,14 +314,10 @@ 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(),
-    );
+    // Clear extension modules from the module map, except preserve `node:*`
+    // modules.
+    let preserve_snapshotted_modules =
+      Some(SUPPORTED_BUILTIN_NODE_MODULES_WITH_PREFIX);
 
     let mut js_runtime = JsRuntime::new(RuntimeOptions {
       module_loader: Some(options.module_loader.clone()),
@@ -331,7 +328,7 @@ 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,
+      preserve_snapshotted_modules,
       inspector: options.maybe_inspector_server.is_some(),
       is_main: true,
       ..Default::default()