From 44e67df1cd637d46744e7471f68f8bc4d1680a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Thu, 9 Mar 2023 16:09:45 -0400
Subject: fix: Split extension registration and snapshotting (#18098)

This commit partially reverts changes from
https://github.com/denoland/deno/pull/18095.

Turns out I made a mistake that became apparent when working
on removing "RuntimeOptions::extensions_with_js" in a follow up.
---
 cli/build.rs | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'cli')

diff --git a/cli/build.rs b/cli/build.rs
index 6687b1e44..846224af2 100644
--- a/cli/build.rs
+++ b/cli/build.rs
@@ -322,40 +322,36 @@ mod ts {
 
 fn create_cli_snapshot(snapshot_path: PathBuf) {
   let extensions: Vec<Extension> = vec![
-    deno_webidl::init_esm(),
-    deno_console::init_esm(),
-    deno_url::init_ops_and_esm(),
-    deno_tls::init(),
-    deno_web::init_ops_and_esm::<PermissionsContainer>(
+    deno_webidl::init(),
+    deno_console::init(),
+    deno_url::init_ops(),
+    deno_tls::init_ops(),
+    deno_web::init_ops::<PermissionsContainer>(
       deno_web::BlobStore::default(),
       Default::default(),
     ),
-    deno_fetch::init_ops_and_esm::<PermissionsContainer>(Default::default()),
-    deno_cache::init_ops_and_esm::<SqliteBackedCache>(None),
-    deno_websocket::init_ops_and_esm::<PermissionsContainer>(
-      "".to_owned(),
-      None,
-      None,
-    ),
-    deno_webstorage::init_ops_and_esm(None),
-    deno_crypto::init_ops_and_esm(None),
-    deno_webgpu::init_ops_and_esm(false),
-    deno_broadcast_channel::init_ops_and_esm(
+    deno_fetch::init_ops::<PermissionsContainer>(Default::default()),
+    deno_cache::init_ops::<SqliteBackedCache>(None),
+    deno_websocket::init_ops::<PermissionsContainer>("".to_owned(), None, None),
+    deno_webstorage::init_ops(None),
+    deno_crypto::init_ops(None),
+    deno_webgpu::init_ops(false),
+    deno_broadcast_channel::init_ops(
       deno_broadcast_channel::InMemoryBroadcastChannel::default(),
       false, // No --unstable.
     ),
-    deno_io::init_ops_and_esm(Default::default()),
-    deno_fs::init_ops_and_esm::<PermissionsContainer>(false),
-    deno_node::init_ops_and_esm::<PermissionsContainer>(None), // No --unstable.
-    deno_node::init_polyfill_ops_and_esm(),
-    deno_ffi::init_ops_and_esm::<PermissionsContainer>(false),
-    deno_net::init_ops_and_esm::<PermissionsContainer>(
+    deno_io::init_ops(Default::default()),
+    deno_fs::init_ops::<PermissionsContainer>(false),
+    deno_node::init_ops::<PermissionsContainer>(None), // No --unstable.
+    deno_node::init_polyfill_ops(),
+    deno_ffi::init_ops::<PermissionsContainer>(false),
+    deno_net::init_ops::<PermissionsContainer>(
       None, false, // No --unstable.
       None,
     ),
-    deno_napi::init::<PermissionsContainer>(),
-    deno_http::init_ops_and_esm(),
-    deno_flash::init_ops_and_esm::<PermissionsContainer>(false), // No --unstable
+    deno_napi::init_ops::<PermissionsContainer>(),
+    deno_http::init_ops(),
+    deno_flash::init_ops::<PermissionsContainer>(false), // No --unstable
   ];
 
   let mut esm_files = include_js_files!(
-- 
cgit v1.2.3