summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorNayeem Rahman <nayeemrmn99@gmail.com>2023-06-13 16:45:06 +0100
committerGitHub <noreply@github.com>2023-06-13 09:45:06 -0600
commitceb03cfb037cf7024a5048b17b508ddda59cfa05 (patch)
tree0c2df444e00f17131f9e2af708f80cdc4b032ce8 /ext
parent5348778666d2d8d7ce138bbdf75ac5aa9f7ed428 (diff)
refactor(core): cleanup feature flags for js source inclusion (#19463)
Remove `ExtensionFileSourceCode::LoadedFromFsDuringSnapshot` and feature `include_js_for_snapshotting` since they leak paths that are only applicable in this repo to embedders. Replace with feature `exclude_js_sources`. Additionally the feature `force_include_js_sources` allows negating it, if both features are set. We need both of these because features are additive and there must be a way of force including sources for snapshot creation while still having the `exclude_js_sources` feature. `force_include_js_sources` is only set for build deps, so sources are still excluded from the final binary. You can also specify `force_include_js_sources` on any extension to override the above features for that extension. Towards #19398. But there was still the snapshot-from-snapshot situation where code could be executed twice, I addressed that by making `mod_evaluate()` and scripts like `core/01_core.js` behave idempotently. This allowed unifying `ext::init_ops()` and `ext::init_ops_and_esm()` into `ext::init()`.
Diffstat (limited to 'ext')
-rw-r--r--ext/fs/lib.rs1
-rw-r--r--ext/net/ops.rs2
-rw-r--r--ext/url/benches/url_ops.rs9
-rw-r--r--ext/web/benches/encoding.rs16
-rw-r--r--ext/web/benches/timers_ops.rs15
-rw-r--r--ext/webidl/benches/dict.rs7
6 files changed, 18 insertions, 32 deletions
diff --git a/ext/fs/lib.rs b/ext/fs/lib.rs
index 7ba6cd7ca..d27712927 100644
--- a/ext/fs/lib.rs
+++ b/ext/fs/lib.rs
@@ -19,7 +19,6 @@ use crate::ops::*;
use deno_core::error::AnyError;
use deno_core::OpState;
use std::cell::RefCell;
-use std::convert::From;
use std::path::Path;
use std::rc::Rc;
diff --git a/ext/net/ops.rs b/ext/net/ops.rs
index 05aa416b4..354acb3bd 100644
--- a/ext/net/ops.rs
+++ b/ext/net/ops.rs
@@ -1034,7 +1034,7 @@ mod tests {
);
let mut runtime = JsRuntime::new(RuntimeOptions {
- extensions: vec![test_ext::init_ops()],
+ extensions: vec![test_ext::init()],
..Default::default()
});
diff --git a/ext/url/benches/url_ops.rs b/ext/url/benches/url_ops.rs
index 835dfea2e..1e3d201f6 100644
--- a/ext/url/benches/url_ops.rs
+++ b/ext/url/benches/url_ops.rs
@@ -7,20 +7,17 @@ use deno_bench_util::bencher::Bencher;
use deno_core::Extension;
use deno_core::ExtensionFileSource;
-use deno_core::ExtensionFileSourceCode;
fn setup() -> Vec<Extension> {
vec![
- deno_webidl::deno_webidl::init_ops_and_esm(),
- deno_url::deno_url::init_ops_and_esm(),
+ deno_webidl::deno_webidl::init(),
+ deno_url::deno_url::init(),
Extension::builder("bench_setup")
.esm(vec![ExtensionFileSource {
specifier: "ext:bench_setup/setup",
- code: ExtensionFileSourceCode::IncludedInBinary(
- r#"import { URL } from "ext:deno_url/00_url.js";
+ code: r#"import { URL } from "ext:deno_url/00_url.js";
globalThis.URL = URL;
"#,
- ),
}])
.esm_entry_point("ext:bench_setup/setup")
.build(),
diff --git a/ext/web/benches/encoding.rs b/ext/web/benches/encoding.rs
index 5b147f00c..9d12d9c2c 100644
--- a/ext/web/benches/encoding.rs
+++ b/ext/web/benches/encoding.rs
@@ -6,7 +6,6 @@ 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;
use deno_core::OpState;
use deno_web::BlobStore;
@@ -24,23 +23,18 @@ impl deno_web::TimersPermission for Permissions {
fn setup() -> Vec<Extension> {
vec![
- deno_webidl::deno_webidl::init_ops_and_esm(),
- deno_url::deno_url::init_ops_and_esm(),
- deno_console::deno_console::init_ops_and_esm(),
- deno_web::deno_web::init_ops_and_esm::<Permissions>(
- BlobStore::default(),
- None,
- ),
+ deno_webidl::deno_webidl::init(),
+ deno_url::deno_url::init(),
+ deno_console::deno_console::init(),
+ deno_web::deno_web::init::<Permissions>(BlobStore::default(), None),
Extension::builder("bench_setup")
.esm(vec![ExtensionFileSource {
specifier: "ext:bench_setup/setup",
- code: ExtensionFileSourceCode::IncludedInBinary(
- r#"
+ code: 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 {});
diff --git a/ext/web/benches/timers_ops.rs b/ext/web/benches/timers_ops.rs
index 084fac98b..c6afea9c1 100644
--- a/ext/web/benches/timers_ops.rs
+++ b/ext/web/benches/timers_ops.rs
@@ -6,7 +6,6 @@ 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;
use deno_core::OpState;
use deno_web::BlobStore;
@@ -22,19 +21,19 @@ impl deno_web::TimersPermission for Permissions {
fn setup() -> Vec<Extension> {
vec![
- deno_webidl::deno_webidl::init_ops_and_esm(),
- deno_url::deno_url::init_ops_and_esm(),
- deno_console::deno_console::init_ops_and_esm(),
- deno_web::deno_web::init_ops_and_esm::<Permissions>(BlobStore::default(), None),
+ deno_webidl::deno_webidl::init(),
+ deno_url::deno_url::init(),
+ deno_console::deno_console::init(),
+ deno_web::deno_web::init::<Permissions>(BlobStore::default(), None),
Extension::builder("bench_setup")
.esm(vec![
ExtensionFileSource {
- specifier: "ext:bench_setup/setup",
- code: ExtensionFileSourceCode::IncludedInBinary(r#"
+ specifier: "ext:bench_setup/setup",
+ code: r#"
import { setTimeout, handleTimerMacrotask } from "ext:deno_web/02_timers.js";
globalThis.setTimeout = setTimeout;
Deno.core.setMacrotaskCallback(handleTimerMacrotask);
- "#)
+ "#
},
])
.state(|state| {
diff --git a/ext/webidl/benches/dict.rs b/ext/webidl/benches/dict.rs
index b3d95c8a3..bf5c0554b 100644
--- a/ext/webidl/benches/dict.rs
+++ b/ext/webidl/benches/dict.rs
@@ -7,17 +7,14 @@ use deno_bench_util::bencher::Bencher;
use deno_core::Extension;
use deno_core::ExtensionFileSource;
-use deno_core::ExtensionFileSourceCode;
fn setup() -> Vec<Extension> {
vec![
- deno_webidl::deno_webidl::init_ops_and_esm(),
+ deno_webidl::deno_webidl::init(),
Extension::builder("deno_webidl_bench")
.esm(vec![ExtensionFileSource {
specifier: "ext:deno_webidl_bench/setup.js",
- code: ExtensionFileSourceCode::IncludedInBinary(include_str!(
- "dict.js"
- )),
+ code: include_str!("dict.js"),
}])
.esm_entry_point("ext:deno_webidl_bench/setup.js")
.build(),