From 56f58a047e3c1cc27ff55988f25173cc18ef6aeb Mon Sep 17 00:00:00 2001
From: Matt Mastracci <matthew@mastracci.com>
Date: Sun, 4 Feb 2024 17:03:14 -0700
Subject: chore: bump deno core (#22243)

Migrations:

- Error registration no longer required for Interrupted or BadResource
(these are core exception)
 - `include_js_files!`/`ExtensionFileSource` changes
---
 ext/web/benches/encoding.rs   | 36 ++++++++++++++++--------------------
 ext/web/benches/timers_ops.rs | 36 ++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 40 deletions(-)

(limited to 'ext/web')

diff --git a/ext/web/benches/encoding.rs b/ext/web/benches/encoding.rs
index 1c14c6401..d0738c645 100644
--- a/ext/web/benches/encoding.rs
+++ b/ext/web/benches/encoding.rs
@@ -5,8 +5,6 @@ use deno_bench_util::bench_or_profile;
 use deno_bench_util::bencher::benchmark_group;
 use deno_bench_util::bencher::Bencher;
 use deno_core::Extension;
-use deno_core::ExtensionFileSource;
-use deno_core::ExtensionFileSourceCode;
 
 #[derive(Clone)]
 struct Permissions;
@@ -18,6 +16,21 @@ impl deno_web::TimersPermission for Permissions {
 }
 
 fn setup() -> Vec<Extension> {
+  deno_core::extension!(
+    bench_setup,
+    esm_entry_point = "ext:bench_setup/setup",
+    esm = ["ext:bench_setup/setup" = {
+      source = r#"
+        import { TextDecoder } from "ext:deno_web/08_text_encoding.js";
+        globalThis.TextDecoder = TextDecoder;
+        globalThis.hello12k = Deno.core.encode("hello world\n".repeat(1e3));
+      "#
+    }],
+    state = |state| {
+      state.put(Permissions {});
+    },
+  );
+
   vec![
     deno_webidl::deno_webidl::init_ops_and_esm(),
     deno_url::deno_url::init_ops_and_esm(),
@@ -26,24 +39,7 @@ fn setup() -> Vec<Extension> {
       Default::default(),
       None,
     ),
-    Extension {
-      name: "bench_setup",
-      esm_files: std::borrow::Cow::Borrowed(&[ExtensionFileSource {
-        specifier: "ext:bench_setup/setup",
-        code: ExtensionFileSourceCode::IncludedInBinary(
-          r#"
-          import { TextDecoder } from "ext:deno_web/08_text_encoding.js";
-          globalThis.TextDecoder = TextDecoder;
-          globalThis.hello12k = Deno.core.encode("hello world\n".repeat(1e3));
-        "#,
-        ),
-      }]),
-      esm_entry_point: Some("ext:bench_setup/setup"),
-      op_state_fn: Some(Box::new(|state| {
-        state.put(Permissions {});
-      })),
-      ..Default::default()
-    },
+    bench_setup::init_ops_and_esm(),
   ]
 }
 
diff --git a/ext/web/benches/timers_ops.rs b/ext/web/benches/timers_ops.rs
index 00721bd1e..eda6d332e 100644
--- a/ext/web/benches/timers_ops.rs
+++ b/ext/web/benches/timers_ops.rs
@@ -5,8 +5,6 @@ use deno_bench_util::bench_or_profile;
 use deno_bench_util::bencher::benchmark_group;
 use deno_bench_util::bencher::Bencher;
 use deno_core::Extension;
-use deno_core::ExtensionFileSource;
-use deno_core::ExtensionFileSourceCode;
 
 #[derive(Clone)]
 struct Permissions;
@@ -18,6 +16,21 @@ impl deno_web::TimersPermission for Permissions {
 }
 
 fn setup() -> Vec<Extension> {
+  deno_core::extension!(
+    bench_setup,
+    esm_entry_point = "ext:bench_setup/setup",
+    esm = ["ext:bench_setup/setup" = {
+      source = r#"
+        import { setTimeout, handleTimerMacrotask } from "ext:deno_web/02_timers.js";
+        globalThis.setTimeout = setTimeout;
+        Deno.core.setMacrotaskCallback(handleTimerMacrotask);
+      "#
+    }],
+    state = |state| {
+      state.put(Permissions {});
+    },
+  );
+
   vec![
     deno_webidl::deno_webidl::init_ops_and_esm(),
     deno_url::deno_url::init_ops_and_esm(),
@@ -26,24 +39,7 @@ fn setup() -> Vec<Extension> {
       Default::default(),
       None,
     ),
-    Extension {
-      name: "bench_setup",
-      esm_files: std::borrow::Cow::Borrowed(&[ExtensionFileSource {
-        specifier: "ext:bench_setup/setup",
-        code: ExtensionFileSourceCode::IncludedInBinary(
-          r#"
-            import { setTimeout, handleTimerMacrotask } from "ext:deno_web/02_timers.js";
-            globalThis.setTimeout = setTimeout;
-            Deno.core.setMacrotaskCallback(handleTimerMacrotask);
-          "#,
-        ),
-      }]),
-      esm_entry_point: Some("ext:bench_setup/setup"),
-      op_state_fn: Some(Box::new(|state| {
-        state.put(Permissions {});
-      })),
-      ..Default::default()
-    },
+    bench_setup::init_ops_and_esm(),
   ]
 }
 
-- 
cgit v1.2.3