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()`. --- runtime/js.rs | 7 ------- 1 file changed, 7 deletions(-) (limited to 'runtime/js.rs') diff --git a/runtime/js.rs b/runtime/js.rs index def2724ce..6aaa32f5f 100644 --- a/runtime/js.rs +++ b/runtime/js.rs @@ -13,10 +13,3 @@ pub fn deno_isolate_init() -> Snapshot { debug!("Deno isolate init with snapshots."); Snapshot::Static(RUNTIME_SNAPSHOT) } - -#[cfg(not(feature = "include_js_files_for_snapshotting"))] -pub static SOURCE_CODE_FOR_99_MAIN_JS: &str = include_str!("js/99_main.js"); - -#[cfg(feature = "include_js_files_for_snapshotting")] -pub static PATH_FOR_99_MAIN_JS: &str = - concat!(env!("CARGO_MANIFEST_DIR"), "/js/99_main.js"); -- cgit v1.2.3