From ceb03cfb037cf7024a5048b17b508ddda59cfa05 Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Tue, 13 Jun 2023 16:45:06 +0100 Subject: 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()`. --- ext/url/benches/url_ops.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ext/url') 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 { 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(), -- cgit v1.2.3