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()`.

Cargo.lock

@@ -949,6 +949,7 @@ dependencies = [
  "anyhow",
  "bytes",
  "deno_ast",
+ "deno_core",
  "deno_ops",
  "futures",
  "indexmap",

bench_util/benches/op_baseline.rs

@@ -19,7 +19,7 @@ deno_core::extension!(
 );
 
 fn setup() -> Vec<Extension> {
-  vec![bench_setup::init_ops()]
+  vec![bench_setup::init()]
 }
 
 #[op]

bench_util/benches/utf8.rs

@@ -7,14 +7,12 @@ use deno_bench_util::bencher::Bencher;
 use deno_bench_util::BenchOptions;
 use deno_core::Extension;
 use deno_core::ExtensionFileSource;
-use deno_core::ExtensionFileSourceCode;
 
 fn setup() -> Vec<Extension> {
   vec![Extension::builder("bench_setup")
     .js(vec![ExtensionFileSource {
       specifier: "ext:bench_setup/setup.js",
-      code: ExtensionFileSourceCode::IncludedInBinary(
+      code: r#"
-        r#"
       const hello = "hello world\n";
       const hello1k = hello.repeat(1e3);
       const hello1m = hello.repeat(1e6);
@@ -22,7 +20,6 @@ fn setup() -> Vec<Extension> {
       const hello1kEncoded = Deno.core.encode(hello1k);
       const hello1mEncoded = Deno.core.encode(hello1m);
       "#,
-      ),
     }])
     .build()]
 }

cli/Cargo.toml

@@ -27,8 +27,8 @@ harness = false
 path = "./bench/lsp_bench_standalone.rs"
 
 [build-dependencies]
-deno_runtime = { workspace = true, features = ["snapshot_from_snapshot", "include_js_files_for_snapshotting"] }
+deno_runtime = { workspace = true, features = ["exclude_js_main_from_snapshot"] }
-deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
+deno_core.workspace = true
 lazy-regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -41,14 +41,14 @@ winres.workspace = true
 
 [dependencies]
 deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] }
-deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] }
+deno_core = { workspace = true, features = ["exclude_js_sources"] }
 deno_doc = "=0.63.1"
 deno_emit = "=0.24.0"
 deno_graph = "=0.49.0"
 deno_lint = { version = "=0.47.0", features = ["docs"] }
 deno_lockfile.workspace = true
 deno_npm.workspace = true
-deno_runtime = { workspace = true, features = ["dont_create_runtime_snapshot", "include_js_files_for_snapshotting"] }
+deno_runtime = { workspace = true, features = ["dont_create_runtime_snapshot"] }
 deno_semver.workspace = true
 deno_task_shell = "=0.12.0"
 eszip = "=0.44.0"

cli/build.rs

@@ -7,7 +7,6 @@ use std::sync::Arc;
 use deno_core::snapshot_util::*;
 use deno_core::Extension;
 use deno_core::ExtensionFileSource;
-use deno_core::ExtensionFileSourceCode;
 use deno_runtime::deno_cache::SqliteBackedCache;
 use deno_runtime::deno_http::DefaultHttpPropertyExtractor;
 use deno_runtime::deno_kv::sqlite::SqliteDbHandler;
@@ -262,15 +261,11 @@ mod ts {
     )
     .unwrap();
 
-    let output = create_snapshot(CreateSnapshotOptions {
+    create_snapshot(CreateSnapshotOptions {
       cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),
       snapshot_path,
       startup_snapshot: None,
-      extensions: vec![deno_tsc::init_ops_and_esm(
+      extensions: vec![deno_tsc::init(op_crate_libs, build_libs, path_dts)],
-        op_crate_libs,
-        build_libs,
-        path_dts,
-      )],
 
       // NOTE(bartlomieju): Compressing the TSC snapshot in debug build took
       // ~45s on M1 MacBook Pro; without compression it took ~1s.
@@ -289,9 +284,6 @@ mod ts {
       })),
       snapshot_module_load_cb: None,
     });
-    for path in output.files_loaded_during_snapshot {
-      println!("cargo:rerun-if-changed={}", path.display());
-    }
   }
 
   pub(crate) fn version() -> String {
@@ -322,55 +314,52 @@ deno_core::extension!(
   customizer = |ext: &mut deno_core::ExtensionBuilder| {
     ext.esm(vec![ExtensionFileSource {
       specifier: "ext:cli/runtime/js/99_main.js",
-      code: ExtensionFileSourceCode::LoadedFromFsDuringSnapshot(
+      code: include_str!("../runtime/js/99_main.js"),
-        std::path::PathBuf::from(deno_runtime::js::PATH_FOR_99_MAIN_JS),
-      ),
     }]);
   }
 );
 
-#[must_use = "The files listed by create_cli_snapshot should be printed as 'cargo:rerun-if-changed' lines"]
+fn create_cli_snapshot(snapshot_path: PathBuf) {
-fn create_cli_snapshot(snapshot_path: PathBuf) -> CreateSnapshotOutput {
   // NOTE(bartlomieju): ordering is important here, keep it in sync with
   // `runtime/worker.rs`, `runtime/web_worker.rs` and `runtime/build.rs`!
   let fs = Arc::new(deno_fs::RealFs);
   let extensions: Vec<Extension> = vec![
-    deno_webidl::deno_webidl::init_ops(),
+    deno_webidl::deno_webidl::init(),
-    deno_console::deno_console::init_ops(),
+    deno_console::deno_console::init(),
-    deno_url::deno_url::init_ops(),
+    deno_url::deno_url::init(),
-    deno_web::deno_web::init_ops::<PermissionsContainer>(
+    deno_web::deno_web::init::<PermissionsContainer>(
       deno_web::BlobStore::default(),
       Default::default(),
     ),
-    deno_fetch::deno_fetch::init_ops::<PermissionsContainer>(Default::default()),
+    deno_fetch::deno_fetch::init::<PermissionsContainer>(Default::default()),
-    deno_cache::deno_cache::init_ops::<SqliteBackedCache>(None),
+    deno_cache::deno_cache::init::<SqliteBackedCache>(None),
-    deno_websocket::deno_websocket::init_ops::<PermissionsContainer>(
+    deno_websocket::deno_websocket::init::<PermissionsContainer>(
       "".to_owned(),
       None,
       None,
     ),
-    deno_webstorage::deno_webstorage::init_ops(None),
+    deno_webstorage::deno_webstorage::init(None),
-    deno_crypto::deno_crypto::init_ops(None),
+    deno_crypto::deno_crypto::init(None),
-    deno_broadcast_channel::deno_broadcast_channel::init_ops(
+    deno_broadcast_channel::deno_broadcast_channel::init(
       deno_broadcast_channel::InMemoryBroadcastChannel::default(),
       false, // No --unstable.
     ),
-    deno_ffi::deno_ffi::init_ops::<PermissionsContainer>(false),
+    deno_ffi::deno_ffi::init::<PermissionsContainer>(false),
-    deno_net::deno_net::init_ops::<PermissionsContainer>(
+    deno_net::deno_net::init::<PermissionsContainer>(
       None, false, // No --unstable.
       None,
     ),
-    deno_tls::deno_tls::init_ops(),
+    deno_tls::deno_tls::init(),
-    deno_kv::deno_kv::init_ops(
+    deno_kv::deno_kv::init(
       SqliteDbHandler::<PermissionsContainer>::new(None),
       false, // No --unstable.
     ),
-    deno_napi::deno_napi::init_ops::<PermissionsContainer>(),
+    deno_napi::deno_napi::init::<PermissionsContainer>(),
-    deno_http::deno_http::init_ops::<DefaultHttpPropertyExtractor>(),
+    deno_http::deno_http::init::<DefaultHttpPropertyExtractor>(),
-    deno_io::deno_io::init_ops(Default::default()),
+    deno_io::deno_io::init(Default::default()),
-    deno_fs::deno_fs::init_ops::<PermissionsContainer>(false, fs.clone()),
+    deno_fs::deno_fs::init::<PermissionsContainer>(false, fs.clone()),
-    deno_node::deno_node::init_ops::<PermissionsContainer>(None, fs),
+    deno_node::deno_node::init::<PermissionsContainer>(None, fs),
-    cli::init_ops_and_esm(), // NOTE: This needs to be init_ops_and_esm!
+    cli::init(),
   ];
 
   create_snapshot(CreateSnapshotOptions {
@@ -485,10 +474,7 @@ fn main() {
   ts::create_compiler_snapshot(compiler_snapshot_path, &c);
 
   let cli_snapshot_path = o.join("CLI_SNAPSHOT.bin");
-  let output = create_cli_snapshot(cli_snapshot_path);
+  create_cli_snapshot(cli_snapshot_path);
-  for path in output.files_loaded_during_snapshot {
-    println!("cargo:rerun-if-changed={}", path.display())
-  }
 
   #[cfg(target_os = "windows")]
   {

cli/lsp/tsc.rs

@@ -3236,7 +3236,7 @@ fn op_script_version(
 /// server.
 fn js_runtime(performance: Arc<Performance>) -> JsRuntime {
   JsRuntime::new(RuntimeOptions {
-    extensions: vec![deno_tsc::init_ops(performance)],
+    extensions: vec![deno_tsc::init(performance)],
     startup_snapshot: Some(tsc::compiler_snapshot()),
     ..Default::default()
   })

cli/ops/mod.rs

@@ -12,7 +12,7 @@ pub mod bench;
 pub mod testing;
 
 pub fn cli_exts(npm_resolver: Arc<CliNpmResolver>) -> Vec<Extension> {
-  vec![deno_cli::init_ops(npm_resolver)]
+  vec![deno_cli::init(npm_resolver)]
 }
 
 deno_core::extension!(deno_cli,

cli/tools/bench.rs

@@ -447,7 +447,7 @@ async fn bench_specifier(
     .create_custom_worker(
       specifier.clone(),
       PermissionsContainer::new(permissions),
-      vec![ops::bench::deno_bench::init_ops(sender.clone())],
+      vec![ops::bench::deno_bench::init(sender.clone())],
       Default::default(),
     )
     .await?;

cli/tools/test.rs

@@ -935,7 +935,7 @@ pub async fn test_specifier(
     .create_custom_worker(
       specifier.clone(),
       PermissionsContainer::new(permissions),
-      vec![ops::testing::deno_test::init_ops(sender.clone())],
+      vec![ops::testing::deno_test::init(sender.clone())],
       Stdio {
         stdin: StdioPipe::Inherit,
         stdout,

cli/tsc/mod.rs

@@ -122,7 +122,7 @@ fn get_asset_texts_from_new_runtime() -> Result<Vec<AssetText>, AnyError> {
   // the assets are stored within the typescript isolate, so take them out of there
   let mut runtime = JsRuntime::new(RuntimeOptions {
     startup_snapshot: Some(compiler_snapshot()),
-    extensions: vec![deno_cli_tsc::init_ops()],
+    extensions: vec![deno_cli_tsc::init()],
     ..Default::default()
   });
   let global = runtime
@@ -787,7 +787,7 @@ pub fn exec(request: Request) -> Result<Response, AnyError> {
 
   let mut runtime = JsRuntime::new(RuntimeOptions {
     startup_snapshot: Some(compiler_snapshot()),
-    extensions: vec![deno_cli_tsc::init_ops(
+    extensions: vec![deno_cli_tsc::init(
       request,
       root_map,
       remapped_specifiers,

core/00_primordials.js

@@ -34,6 +34,9 @@
 "use strict";
 
 (() => {
+  if (globalThis.__bootstrap) {
+    return;
+  }
   const primordials = {};
 
   const {

core/01_core.js

@@ -2,6 +2,9 @@
 "use strict";
 
 ((window) => {
+  if (globalThis.__bootstrap.core) {
+    return;
+  }
   const {
     Array,
     ArrayPrototypeFill,

core/02_error.js

@@ -2,6 +2,9 @@
 "use strict";
 
 ((window) => {
+  if (globalThis.__bootstrap.core.prepareStackTrace) {
+    return;
+  }
   const core = Deno.core;
   const ops = core.ops;
   const {

core/Cargo.toml

@@ -16,7 +16,10 @@ path = "lib.rs"
 [features]
 default = ["v8_use_custom_libcxx"]
 v8_use_custom_libcxx = ["v8/use_custom_libcxx"]
-include_js_files_for_snapshotting = []
+# Enable to exclude JS sources from the binary (e.g. if they are already snapshotted).
+exclude_js_sources = []
+# Enable to override `exclude_js_sources` (e.g. for snapshot creation in `build.rs`).
+force_include_js_sources = ["exclude_js_sources"]
 
 [dependencies]
 anyhow.workspace = true
@@ -47,3 +50,4 @@ path = "examples/http_bench_json_ops/main.rs"
 # These dependencies are only used for the 'http_bench_*_ops' examples.
 [dev-dependencies]
 deno_ast.workspace = true
+deno_core = { workspace = true, features = ["force_include_js_sources"] }

core/extensions.rs

@@ -1,32 +1,15 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 use crate::modules::ModuleCode;
 use crate::OpState;
-use anyhow::Context as _;
-use anyhow::Error;
 use std::cell::RefCell;
-use std::path::PathBuf;
 use std::rc::Rc;
 use std::task::Context;
 use v8::fast_api::FastFunction;
 
-#[derive(Clone, Debug)]
-pub enum ExtensionFileSourceCode {
-  /// Source code is included in the binary produced. Either by being defined
-  /// inline, or included using `include_str!()`. If you are snapshotting, this
-  /// will result in two copies of the source code being included - one in the
-  /// snapshot, the other the static string in the `Extension`.
-  IncludedInBinary(&'static str),
-
-  // Source code is loaded from a file on disk. It's meant to be used if the
-  // embedder is creating snapshots. Files will be loaded from the filesystem
-  // during the build time and they will only be present in the V8 snapshot.
-  LoadedFromFsDuringSnapshot(PathBuf),
-}
-
 #[derive(Clone, Debug)]
 pub struct ExtensionFileSource {
   pub specifier: &'static str,
-  pub code: ExtensionFileSourceCode,
+  pub code: &'static str,
 }
 
 impl ExtensionFileSource {
@@ -34,29 +17,14 @@ impl ExtensionFileSource {
     s.chars().filter(|c| !c.is_ascii()).collect::<String>()
   }
 
-  pub fn load(&self) -> Result<ModuleCode, Error> {
+  pub fn load(&self) -> ModuleCode {
-    match &self.code {
+    debug_assert!(
-      ExtensionFileSourceCode::IncludedInBinary(code) => {
+      self.code.is_ascii(),
-        debug_assert!(
+      "Extension code must be 7-bit ASCII: {} (found {})",
-          code.is_ascii(),
+      self.specifier,
-          "Extension code must be 7-bit ASCII: {} (found {})",
+      Self::find_non_ascii(self.code)
-          self.specifier,
+    );
-          Self::find_non_ascii(code)
+    ModuleCode::from_static(self.code)
-        );
-        Ok(ModuleCode::from_static(code))
-      }
-      ExtensionFileSourceCode::LoadedFromFsDuringSnapshot(path) => {
-        let msg = || format!("Failed to read \"{}\"", path.display());
-        let s = std::fs::read_to_string(path).with_context(msg)?;
-        debug_assert!(
-          s.is_ascii(),
-          "Extension code must be 7-bit ASCII: {} (found {})",
-          self.specifier,
-          Self::find_non_ascii(&s)
-        );
-        Ok(s.into())
-      }
-    }
   }
 }
 
@@ -187,6 +155,7 @@ macro_rules! extension {
     $(, esm = [ $( dir $dir_esm:literal , )? $( $esm:literal ),* $(,)? ] )?
     $(, esm_setup_script = $esm_setup_script:expr )?
     $(, js = [ $( dir $dir_js:literal , )? $( $js:literal ),* $(,)? ] )?
+    $(, force_include_js_sources $($force_include_js_sources:block)? )? // dummy variable
     $(, options = { $( $options_id:ident : $options_type:ty ),* $(,)? } )?
     $(, middleware = $middleware_fn:expr )?
     $(, state = $state_fn:expr )?
@@ -211,9 +180,9 @@ macro_rules! extension {
       #[inline(always)]
       #[allow(unused_variables)]
       fn with_js(ext: &mut $crate::ExtensionBuilder) {
-        $( ext.esm(
+        ext.esm(
-          $crate::include_js_files!( $name $( dir $dir_esm , )? $( $esm , )* )
+          $crate::include_js_files!( $name $( force_include_js_sources $($force_include_js_sources)?, )? $( $( dir $dir_esm , )? $( $esm , )* )? )
-        ); )?
+        );
         $(
           ext.esm(vec![ExtensionFileSource {
             specifier: "ext:setup",
@@ -223,9 +192,9 @@ macro_rules! extension {
         $(
           ext.esm_entry_point($esm_entry_point);
         )?
-        $( ext.js(
+        ext.js(
-          $crate::include_js_files!( $name $( dir $dir_js , )? $( $js , )* )
+          $crate::include_js_files!( $name $( force_include_js_sources $($force_include_js_sources)?, )? $( $( dir $dir_js , )? $( $js , )* )? )
-        ); )?
+        );
       }
 
       // If ops were specified, add those ops to the extension.
@@ -285,7 +254,7 @@ macro_rules! extension {
       }
 
       #[allow(dead_code)]
-      pub fn init_ops_and_esm $( <  $( $param : $type + 'static ),+ > )? ( $( $( $options_id : $options_type ),* )? ) -> $crate::Extension
+      pub fn init $( <  $( $param : $type + 'static ),+ > )? ( $( $( $options_id : $options_type ),* )? ) -> $crate::Extension
       $( where $( $bound : $bound_type ),+ )?
       {
         let mut ext = Self::ext();
@@ -296,17 +265,6 @@ macro_rules! extension {
         Self::with_customizer(&mut ext);
         ext.take()
       }
-
-      #[allow(dead_code)]
-      pub fn init_ops $( <  $( $param : $type + 'static ),+ > )? ( $( $( $options_id : $options_type ),* )? ) -> $crate::Extension
-      $( where $( $bound : $bound_type ),+ )?
-      {
-        let mut ext = Self::ext();
-        Self::with_ops $( ::< $( $param ),+ > )?(&mut ext);
-        Self::with_state_and_middleware $( ::< $( $param ),+ > )?(&mut ext, $( $( $options_id , )* )? );
-        Self::with_customizer(&mut ext);
-        ext.take()
-      }
     }
   };
 
@@ -608,54 +566,49 @@ impl ExtensionBuilder {
 /// - "ext:my_extension/js/01_hello.js"
 /// - "ext:my_extension/js/02_goodbye.js"
 /// ```
-#[cfg(not(feature = "include_js_files_for_snapshotting"))]
+#[cfg(not(all(
+  feature = "exclude_js_sources",
+  not(feature = "force_include_js_sources")
+)))]
 #[macro_export]
 macro_rules! include_js_files {
-  ($name:ident dir $dir:literal, $($file:literal,)+) => {
+  ($name:ident $(force_include_js_sources $($dummy:block)?,)? $(dir $dir:literal,)? $($file:literal,)*) => {
-    vec![
+    $crate::force_include_js_files!($name $(dir $dir,)? $($file,)*)
-      $($crate::ExtensionFileSource {
-        specifier: concat!("ext:", stringify!($name), "/", $file),
-        code: $crate::ExtensionFileSourceCode::IncludedInBinary(
-          include_str!(concat!($dir, "/", $file)
-        )),
-      },)+
-    ]
-  };
-
-  ($name:ident $($file:literal,)+) => {
-    vec![
-      $($crate::ExtensionFileSource {
-        specifier: concat!("ext:", stringify!($name), "/", $file),
-        code: $crate::ExtensionFileSourceCode::IncludedInBinary(
-          include_str!($file)
-        ),
-      },)+
-    ]
   };
 }
 
-#[cfg(feature = "include_js_files_for_snapshotting")]
+#[cfg(all(
+  feature = "exclude_js_sources",
+  not(feature = "force_include_js_sources")
+))]
 #[macro_export]
 macro_rules! include_js_files {
-  ($name:ident dir $dir:literal, $($file:literal,)+) => {
+  ($name:ident force_include_js_sources $($dummy:block)?, $(dir $dir:literal,)? $($file:literal,)*) => {
+    $crate::force_include_js_files!($name $(dir $dir,)? $($file,)*)
+  };
+
+  ($name:ident $(dir $dir:literal,)? $($file:literal,)*) => {
+    vec![]
+  };
+}
+
+#[macro_export]
+macro_rules! force_include_js_files {
+  ($name:ident dir $dir:literal, $($file:literal,)*) => {
     vec![
       $($crate::ExtensionFileSource {
         specifier: concat!("ext:", stringify!($name), "/", $file),
-        code: $crate::ExtensionFileSourceCode::LoadedFromFsDuringSnapshot(
+        code: include_str!(concat!($dir, "/", $file)),
-          std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join($dir).join($file)
+      },)*
-        ),
-      },)+
     ]
   };
 
-  ($name:ident $($file:literal,)+) => {
+  ($name:ident $($file:literal,)*) => {
     vec![
       $($crate::ExtensionFileSource {
         specifier: concat!("ext:", stringify!($name), "/", $file),
-        code: $crate::ExtensionFileSourceCode::LoadedFromFsDuringSnapshot(
+        code: include_str!($file),
-          std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join($file)
+      },)*
-        ),
-      },)+
     ]
   };
 }

core/inspector.rs

@@ -365,6 +365,9 @@ impl JsRuntimeInspector {
             w.poll_state = PollState::Parked;
             w.parked_thread.replace(thread::current());
           }
+          PollState::Parked => {
+            w.parked_thread.replace(thread::current());
+          }
           _ => unreachable!(),
         };
         w.poll_state

core/lib.rs

@@ -60,7 +60,6 @@ pub use crate::async_cell::RcRef;
 pub use crate::extensions::Extension;
 pub use crate::extensions::ExtensionBuilder;
 pub use crate::extensions::ExtensionFileSource;
-pub use crate::extensions::ExtensionFileSourceCode;
 pub use crate::extensions::OpDecl;
 pub use crate::extensions::OpMiddlewareFn;
 pub use crate::fast_string::FastString;

core/modules.rs

@@ -438,7 +438,7 @@ impl ModuleLoader for ExtModuleLoader {
     let result = if let Some(load_callback) = &self.maybe_load_callback {
       load_callback(source)
     } else {
-      source.load()
+      Ok(source.load())
     };
     match result {
       Ok(code) => {
@@ -459,29 +459,6 @@ impl ModuleLoader for ExtModuleLoader {
   }
 }
 
-impl Drop for ExtModuleLoader {
-  fn drop(&mut self) {
-    let sources = self.sources.get_mut();
-    let used_specifiers = self.used_specifiers.get_mut();
-    let unused_modules: Vec<_> = sources
-      .iter()
-      .filter(|(k, _)| !used_specifiers.contains(k.as_str()))
-      .collect();
-
-    if !unused_modules.is_empty() {
-      let mut msg =
-        "Following modules were passed to ExtModuleLoader but never used:\n"
-          .to_string();
-      for m in unused_modules {
-        msg.push_str("  - ");
-        msg.push_str(m.0);
-        msg.push('\n');
-      }
-      panic!("{}", msg);
-    }
-  }
-}
-
 /// Basic file system module loader.
 ///
 /// Note that this loader will **block** event loop
@@ -2044,7 +2021,7 @@ import "/a.js";
     deno_core::extension!(test_ext, ops = [op_test]);
 
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       module_loader: Some(loader),
       ..Default::default()
     });

core/runtime.rs

@@ -510,7 +510,7 @@ impl JsRuntime {
     maybe_load_callback: Option<ExtModuleLoaderCb>,
   ) -> JsRuntime {
     let init_mode = InitMode::from_options(&options);
-    let (op_state, ops) = Self::create_opstate(&mut options, init_mode);
+    let (op_state, ops) = Self::create_opstate(&mut options);
     let op_state = Rc::new(RefCell::new(op_state));
 
     // Collect event-loop middleware
@@ -860,7 +860,7 @@ impl JsRuntime {
             realm.execute_script(
               self.v8_isolate(),
               file_source.specifier,
-              file_source.load()?,
+              file_source.load(),
             )?;
           }
         }
@@ -963,20 +963,11 @@ impl JsRuntime {
   }
 
   /// Initializes ops of provided Extensions
-  fn create_opstate(
+  fn create_opstate(options: &mut RuntimeOptions) -> (OpState, Vec<OpDecl>) {
-    options: &mut RuntimeOptions,
-    init_mode: InitMode,
-  ) -> (OpState, Vec<OpDecl>) {
     // Add built-in extension
-    if init_mode == InitMode::FromSnapshot {
+    options
-      options
+      .extensions
-        .extensions
+      .insert(0, crate::ops_builtin::core::init());
-        .insert(0, crate::ops_builtin::core::init_ops());
-    } else {
-      options
-        .extensions
-        .insert(0, crate::ops_builtin::core::init_ops_and_esm());
-    }
 
     let ops = Self::collect_ops(&mut options.extensions);
 
@@ -1858,6 +1849,19 @@ impl JsRuntime {
       .map(|handle| v8::Local::new(tc_scope, handle))
       .expect("ModuleInfo not found");
     let mut status = module.get_status();
+    if status == v8::ModuleStatus::Evaluated {
+      let (sender, receiver) = oneshot::channel();
+      sender.send(Ok(())).unwrap();
+      return receiver;
+    }
+    if status == v8::ModuleStatus::Errored {
+      let (sender, receiver) = oneshot::channel();
+      let exception = module.get_exception();
+      sender
+        .send(exception_to_err_result(tc_scope, exception, false))
+        .unwrap();
+      return receiver;
+    }
     assert_eq!(
       status,
       v8::ModuleStatus::Instantiated,
@@ -2703,7 +2707,7 @@ pub mod tests {
       }
     );
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops(mode, dispatch_count.clone())],
+      extensions: vec![test_ext::init(mode, dispatch_count.clone())],
       get_error_class_fn: Some(&|error| {
         crate::error::get_custom_error_class(error).unwrap()
       }),
@@ -3118,7 +3122,7 @@ pub mod tests {
 
     deno_core::extension!(test_ext, ops = [op_err]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       get_error_class_fn: Some(&get_error_class_name),
       ..Default::default()
     });
@@ -3724,7 +3728,7 @@ main();
 
     deno_core::extension!(test_ext, ops = [op_err_sync, op_err_async]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -3886,7 +3890,7 @@ assertEquals(1, notify_return_value);
       state = |state| state.put(InnerState(42))
     );
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -3917,7 +3921,7 @@ assertEquals(1, notify_return_value);
       ops = [op_sync_serialize_object_with_numbers_as_keys]
     );
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -3959,7 +3963,7 @@ Deno.core.ops.op_sync_serialize_object_with_numbers_as_keys({
       ops = [op_async_serialize_object_with_numbers_as_keys]
     );
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -3995,7 +3999,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_async_sleep]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -4050,7 +4054,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_macrotask, op_next_tick]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -4191,7 +4195,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_promise_reject]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -4334,7 +4338,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
     }
 
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       module_loader: Some(Rc::new(ModsLoader)),
       ..Default::default()
     });
@@ -4359,7 +4363,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_err]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
     assert!(runtime
@@ -4384,7 +4388,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_add_4]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
     let r = runtime
@@ -4407,7 +4411,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops_fn = ops);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
     let err = runtime
@@ -4436,7 +4440,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_sum_take, op_boomerang]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -4505,7 +4509,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
       middleware = |op| if op.is_unstable { op.disable() } else { op }
     );
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
     runtime
@@ -4553,7 +4557,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_test]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
     let realm = runtime.create_realm().unwrap();
@@ -4586,7 +4590,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
     deno_core::extension!(test_ext, ops = [op_test]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
       startup_snapshot: Some(Snapshot::Boxed(snapshot)),
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
     let realm = runtime.create_realm().unwrap();
@@ -4620,7 +4624,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_test]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       get_error_class_fn: Some(&|error| {
         crate::error::get_custom_error_class(error).unwrap()
       }),
@@ -4668,7 +4672,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_test]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       get_error_class_fn: Some(&|error| {
         crate::error::get_custom_error_class(error).unwrap()
       }),
@@ -4745,7 +4749,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_pending]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -4792,7 +4796,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_pending]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 
@@ -4892,7 +4896,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [a::op_test, op_test]);
     JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
   }
@@ -4911,7 +4915,7 @@ Deno.core.opAsync("op_async_serialize_object_with_numbers_as_keys", {
 
     deno_core::extension!(test_ext, ops = [op_test_sync, op_test_async]);
     let mut runtime = JsRuntime::new(RuntimeOptions {
-      extensions: vec![test_ext::init_ops()],
+      extensions: vec![test_ext::init()],
       ..Default::default()
     });
 

core/snapshot_util.rs

@@ -22,16 +22,7 @@ pub struct CreateSnapshotOptions {
   pub snapshot_module_load_cb: Option<ExtModuleLoaderCb>,
 }
 
-pub struct CreateSnapshotOutput {
+pub fn create_snapshot(create_snapshot_options: CreateSnapshotOptions) {
-  /// Any files marked as LoadedFromFsDuringSnapshot are collected here and should be
-  /// printed as 'cargo:rerun-if-changed' lines from your build script.
-  pub files_loaded_during_snapshot: Vec<PathBuf>,
-}
-
-#[must_use = "The files listed by create_snapshot should be printed as 'cargo:rerun-if-changed' lines"]
-pub fn create_snapshot(
-  create_snapshot_options: CreateSnapshotOptions,
-) -> CreateSnapshotOutput {
   let mut mark = Instant::now();
 
   let js_runtime = JsRuntimeForSnapshot::new(
@@ -51,22 +42,6 @@ pub fn create_snapshot(
   );
   mark = Instant::now();
 
-  let mut files_loaded_during_snapshot = vec![];
-  for source in js_runtime
-    .extensions()
-    .iter()
-    .flat_map(|e| vec![e.get_esm_sources(), e.get_js_sources()])
-    .flatten()
-    .flatten()
-  {
-    use crate::ExtensionFileSourceCode;
-    if let ExtensionFileSourceCode::LoadedFromFsDuringSnapshot(path) =
-      &source.code
-    {
-      files_loaded_during_snapshot.push(path.clone());
-    }
-  }
-
   let snapshot = js_runtime.snapshot();
   let snapshot_slice: &[u8] = &snapshot;
   println!(
@@ -112,9 +87,6 @@ pub fn create_snapshot(
     Instant::now().saturating_duration_since(mark),
     create_snapshot_options.snapshot_path.display(),
   );
-  CreateSnapshotOutput {
-    files_loaded_during_snapshot,
-  }
 }
 
 pub type FilterFn = Box<dyn Fn(&PathBuf) -> bool>;

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;
 

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()
     });
 

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_webidl::deno_webidl::init(),
-    deno_url::deno_url::init_ops_and_esm(),
+    deno_url::deno_url::init(),
     Extension::builder("bench_setup")
       .esm(vec![ExtensionFileSource {
         specifier: "ext:bench_setup/setup",
-        code: ExtensionFileSourceCode::IncludedInBinary(
+        code: r#"import { URL } from "ext:deno_url/00_url.js";
-          r#"import { URL } from "ext:deno_url/00_url.js";
         globalThis.URL = URL;
         "#,
-        ),
       }])
       .esm_entry_point("ext:bench_setup/setup")
       .build(),

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_webidl::deno_webidl::init(),
-    deno_url::deno_url::init_ops_and_esm(),
+    deno_url::deno_url::init(),
-    deno_console::deno_console::init_ops_and_esm(),
+    deno_console::deno_console::init(),
-    deno_web::deno_web::init_ops_and_esm::<Permissions>(
+    deno_web::deno_web::init::<Permissions>(BlobStore::default(), None),
-      BlobStore::default(),
-      None,
-    ),
     Extension::builder("bench_setup")
       .esm(vec![ExtensionFileSource {
         specifier: "ext:bench_setup/setup",
-        code: ExtensionFileSourceCode::IncludedInBinary(
+        code: r#"
-          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 {});

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_webidl::deno_webidl::init(),
-    deno_url::deno_url::init_ops_and_esm(),
+    deno_url::deno_url::init(),
-    deno_console::deno_console::init_ops_and_esm(),
+    deno_console::deno_console::init(),
-    deno_web::deno_web::init_ops_and_esm::<Permissions>(BlobStore::default(), None),
+    deno_web::deno_web::init::<Permissions>(BlobStore::default(), None),
     Extension::builder("bench_setup")
     .esm(vec![
       ExtensionFileSource {
-        specifier: "ext:bench_setup/setup", 
+        specifier: "ext:bench_setup/setup",
-        code: ExtensionFileSourceCode::IncludedInBinary(r#"
+        code: r#"
       import { setTimeout, handleTimerMacrotask } from "ext:deno_web/02_timers.js";
       globalThis.setTimeout = setTimeout;
       Deno.core.setMacrotaskCallback(handleTimerMacrotask);
-      "#)
+      "#
       },
     ])
     .state(|state| {

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!(
+        code: include_str!("dict.js"),
-          "dict.js"
-        )),
       }])
       .esm_entry_point("ext:deno_webidl_bench/setup.js")
       .build(),

runtime/Cargo.toml

@@ -14,15 +14,8 @@ description = "Provides the deno runtime library"
 docsrs = []
 # A feature that disables creation of startup snapshot during in the build script.
 dont_create_runtime_snapshot = []
-# A feature that changes how startup snapshot is generated, that allows
+# Enable to exclude `js/99_main.js` from the generated snapshot.
-# extending it in embedder crates.
+exclude_js_main_from_snapshot = []
-snapshot_from_snapshot = []
-# A feature that disables embedding of the JavaScript source files in the binary.
-# With this feature enabled, the sources must be consumed during build time,
-# by creating a startup snapshot.
-include_js_files_for_snapshotting = [
-  "deno_core/include_js_files_for_snapshotting",
-]
 
 [lib]
 name = "deno_runtime"

runtime/build.rs

@@ -35,7 +35,7 @@ mod startup_snapshot {
         file_source.specifier
       ),
     };
-    let code = file_source.load()?;
+    let code = file_source.load();
 
     if !should_transpile {
       return Ok(code);
@@ -264,22 +264,20 @@ mod startup_snapshot {
     ],
   );
 
-  #[cfg(not(feature = "snapshot_from_snapshot"))]
+  #[cfg(not(feature = "exclude_js_main_from_snapshot"))]
   deno_core::extension!(
     runtime_main,
     deps = [runtime],
     customizer = |ext: &mut deno_core::ExtensionBuilder| {
       ext.esm(vec![ExtensionFileSource {
         specifier: "ext:runtime_main/js/99_main.js",
-        code: deno_core::ExtensionFileSourceCode::IncludedInBinary(
+        code: include_str!("js/99_main.js"),
-          include_str!("js/99_main.js"),
-        ),
       }]);
       ext.esm_entry_point("ext:runtime_main/js/99_main.js");
     }
   );
 
-  #[cfg(feature = "snapshot_from_snapshot")]
+  #[cfg(feature = "exclude_js_main_from_snapshot")]
   deno_core::extension!(
     runtime_main,
     deps = [runtime],
@@ -294,50 +292,48 @@ mod startup_snapshot {
     // `runtime/worker.rs`, `runtime/web_worker.rs` and `cli/build.rs`!
     let fs = std::sync::Arc::new(deno_fs::RealFs);
     let extensions: Vec<Extension> = vec![
-      deno_webidl::deno_webidl::init_ops_and_esm(),
+      deno_webidl::deno_webidl::init(),
-      deno_console::deno_console::init_ops_and_esm(),
+      deno_console::deno_console::init(),
-      deno_url::deno_url::init_ops_and_esm(),
+      deno_url::deno_url::init(),
-      deno_web::deno_web::init_ops_and_esm::<Permissions>(
+      deno_web::deno_web::init::<Permissions>(
         deno_web::BlobStore::default(),
         Default::default(),
       ),
-      deno_fetch::deno_fetch::init_ops_and_esm::<Permissions>(
+      deno_fetch::deno_fetch::init::<Permissions>(Default::default()),
-        Default::default(),
+      deno_cache::deno_cache::init::<SqliteBackedCache>(None),
-      ),
+      deno_websocket::deno_websocket::init::<Permissions>(
-      deno_cache::deno_cache::init_ops_and_esm::<SqliteBackedCache>(None),
-      deno_websocket::deno_websocket::init_ops_and_esm::<Permissions>(
         "".to_owned(),
         None,
         None,
       ),
-      deno_webstorage::deno_webstorage::init_ops_and_esm(None),
+      deno_webstorage::deno_webstorage::init(None),
-      deno_crypto::deno_crypto::init_ops_and_esm(None),
+      deno_crypto::deno_crypto::init(None),
-      deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm(
+      deno_broadcast_channel::deno_broadcast_channel::init(
         deno_broadcast_channel::InMemoryBroadcastChannel::default(),
         false, // No --unstable.
       ),
-      deno_ffi::deno_ffi::init_ops_and_esm::<Permissions>(false),
+      deno_ffi::deno_ffi::init::<Permissions>(false),
-      deno_net::deno_net::init_ops_and_esm::<Permissions>(
+      deno_net::deno_net::init::<Permissions>(
         None, false, // No --unstable.
         None,
       ),
-      deno_tls::deno_tls::init_ops_and_esm(),
+      deno_tls::deno_tls::init(),
-      deno_kv::deno_kv::init_ops_and_esm(
+      deno_kv::deno_kv::init(
         deno_kv::sqlite::SqliteDbHandler::<Permissions>::new(None),
         false, // No --unstable
       ),
-      deno_napi::deno_napi::init_ops_and_esm::<Permissions>(),
+      deno_napi::deno_napi::init::<Permissions>(),
-      deno_http::deno_http::init_ops_and_esm::<DefaultHttpPropertyExtractor>(),
+      deno_http::deno_http::init::<DefaultHttpPropertyExtractor>(),
-      deno_io::deno_io::init_ops_and_esm(Default::default()),
+      deno_io::deno_io::init(Default::default()),
-      deno_fs::deno_fs::init_ops_and_esm::<Permissions>(false, fs.clone()),
+      deno_fs::deno_fs::init::<Permissions>(false, fs.clone()),
-      runtime::init_ops_and_esm(),
+      runtime::init(),
       // FIXME(bartlomieju): these extensions are specified last, because they
       // depend on `runtime`, even though it should be other way around
-      deno_node::deno_node::init_ops_and_esm::<Permissions>(None, fs),
+      deno_node::deno_node::init::<Permissions>(None, fs),
-      runtime_main::init_ops_and_esm(),
+      runtime_main::init(),
     ];
 
-    let output = create_snapshot(CreateSnapshotOptions {
+    create_snapshot(CreateSnapshotOptions {
       cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),
       snapshot_path,
       startup_snapshot: None,
@@ -345,9 +341,6 @@ mod startup_snapshot {
       compression_cb: None,
       snapshot_module_load_cb: Some(Box::new(transpile_ts_for_snapshotting)),
     });
-    for path in output.files_loaded_during_snapshot {
-      println!("cargo:rerun-if-changed={}", path.display());
-    }
   }
 }
 

runtime/examples/extension_with_esm/main.rs

@@ -26,7 +26,7 @@ async fn main() -> Result<(), AnyError> {
     PermissionsContainer::allow_all(),
     WorkerOptions {
       module_loader: Rc::new(FsModuleLoader),
-      extensions: vec![hello_runtime::init_ops_and_esm()],
+      extensions: vec![hello_runtime::init()],
       ..Default::default()
     },
   );

runtime/examples/extension_with_ops/main.rs

@@ -28,7 +28,7 @@ async fn main() -> Result<(), AnyError> {
     PermissionsContainer::allow_all(),
     WorkerOptions {
       module_loader: Rc::new(FsModuleLoader),
-      extensions: vec![hello_runtime::init_ops()],
+      extensions: vec![hello_runtime::init()],
       ..Default::default()
     },
   );

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");

runtime/web_worker.rs

@@ -399,14 +399,14 @@ impl WebWorker {
     // `runtime/build.rs`, `runtime/worker.rs` and `cli/build.rs`!
     let mut extensions: Vec<Extension> = vec![
       // Web APIs
-      deno_webidl::deno_webidl::init_ops(),
+      deno_webidl::deno_webidl::init(),
-      deno_console::deno_console::init_ops(),
+      deno_console::deno_console::init(),
-      deno_url::deno_url::init_ops(),
+      deno_url::deno_url::init(),
-      deno_web::deno_web::init_ops::<PermissionsContainer>(
+      deno_web::deno_web::init::<PermissionsContainer>(
         options.blob_store.clone(),
         Some(main_module.clone()),
       ),
-      deno_fetch::deno_fetch::init_ops::<PermissionsContainer>(
+      deno_fetch::deno_fetch::init::<PermissionsContainer>(
         deno_fetch::Options {
           user_agent: options.bootstrap.user_agent.clone(),
           root_cert_store_provider: options.root_cert_store_provider.clone(),
@@ -417,57 +417,57 @@ impl WebWorker {
           ..Default::default()
         },
       ),
-      deno_cache::deno_cache::init_ops::<SqliteBackedCache>(create_cache),
+      deno_cache::deno_cache::init::<SqliteBackedCache>(create_cache),
-      deno_websocket::deno_websocket::init_ops::<PermissionsContainer>(
+      deno_websocket::deno_websocket::init::<PermissionsContainer>(
         options.bootstrap.user_agent.clone(),
         options.root_cert_store_provider.clone(),
         options.unsafely_ignore_certificate_errors.clone(),
       ),
-      deno_webstorage::deno_webstorage::init_ops(None).disable(),
+      deno_webstorage::deno_webstorage::init(None).disable(),
-      deno_crypto::deno_crypto::init_ops(options.seed),
+      deno_crypto::deno_crypto::init(options.seed),
-      deno_broadcast_channel::deno_broadcast_channel::init_ops(
+      deno_broadcast_channel::deno_broadcast_channel::init(
         options.broadcast_channel.clone(),
         unstable,
       ),
-      deno_ffi::deno_ffi::init_ops::<PermissionsContainer>(unstable),
+      deno_ffi::deno_ffi::init::<PermissionsContainer>(unstable),
-      deno_net::deno_net::init_ops::<PermissionsContainer>(
+      deno_net::deno_net::init::<PermissionsContainer>(
         options.root_cert_store_provider.clone(),
         unstable,
         options.unsafely_ignore_certificate_errors.clone(),
       ),
-      deno_tls::deno_tls::init_ops(),
+      deno_tls::deno_tls::init(),
-      deno_kv::deno_kv::init_ops(
+      deno_kv::deno_kv::init(
         SqliteDbHandler::<PermissionsContainer>::new(None),
         unstable,
       ),
-      deno_napi::deno_napi::init_ops::<PermissionsContainer>(),
+      deno_napi::deno_napi::init::<PermissionsContainer>(),
-      deno_http::deno_http::init_ops::<DefaultHttpPropertyExtractor>(),
+      deno_http::deno_http::init::<DefaultHttpPropertyExtractor>(),
-      deno_io::deno_io::init_ops(Some(options.stdio)),
+      deno_io::deno_io::init(Some(options.stdio)),
-      deno_fs::deno_fs::init_ops::<PermissionsContainer>(
+      deno_fs::deno_fs::init::<PermissionsContainer>(
         unstable,
         options.fs.clone(),
       ),
-      deno_node::deno_node::init_ops::<PermissionsContainer>(
+      deno_node::deno_node::init::<PermissionsContainer>(
         options.npm_resolver,
         options.fs,
       ),
       // Runtime ops that are always initialized for WebWorkers
-      ops::web_worker::deno_web_worker::init_ops(),
+      ops::web_worker::deno_web_worker::init(),
-      ops::runtime::deno_runtime::init_ops(main_module.clone()),
+      ops::runtime::deno_runtime::init(main_module.clone()),
-      ops::worker_host::deno_worker_host::init_ops(
+      ops::worker_host::deno_worker_host::init(
         options.create_web_worker_cb.clone(),
         options.preload_module_cb.clone(),
         options.pre_execute_module_cb.clone(),
         options.format_js_error_fn.clone(),
       ),
-      ops::fs_events::deno_fs_events::init_ops(),
+      ops::fs_events::deno_fs_events::init(),
-      ops::os::deno_os_worker::init_ops(),
+      ops::os::deno_os_worker::init(),
-      ops::permissions::deno_permissions::init_ops(),
+      ops::permissions::deno_permissions::init(),
-      ops::process::deno_process::init_ops(),
+      ops::process::deno_process::init(),
-      ops::signal::deno_signal::init_ops(),
+      ops::signal::deno_signal::init(),
-      ops::tty::deno_tty::init_ops(),
+      ops::tty::deno_tty::init(),
-      ops::http::deno_http_runtime::init_ops(),
+      ops::http::deno_http_runtime::init(),
-      deno_permissions_web_worker::init_ops(
+      deno_permissions_web_worker::init(
         permissions,
         unstable,
         enable_testing_features,

runtime/worker.rs

@@ -235,14 +235,14 @@ impl MainWorker {
     // `runtime/build.rs`, `runtime/web_worker.rs` and `cli/build.rs`!
     let mut extensions = vec![
       // Web APIs
-      deno_webidl::deno_webidl::init_ops(),
+      deno_webidl::deno_webidl::init(),
-      deno_console::deno_console::init_ops(),
+      deno_console::deno_console::init(),
-      deno_url::deno_url::init_ops(),
+      deno_url::deno_url::init(),
-      deno_web::deno_web::init_ops::<PermissionsContainer>(
+      deno_web::deno_web::init::<PermissionsContainer>(
         options.blob_store.clone(),
         options.bootstrap.location.clone(),
       ),
-      deno_fetch::deno_fetch::init_ops::<PermissionsContainer>(
+      deno_fetch::deno_fetch::init::<PermissionsContainer>(
         deno_fetch::Options {
           user_agent: options.bootstrap.user_agent.clone(),
           root_cert_store_provider: options.root_cert_store_provider.clone(),
@@ -253,60 +253,60 @@ impl MainWorker {
           ..Default::default()
         },
       ),
-      deno_cache::deno_cache::init_ops::<SqliteBackedCache>(create_cache),
+      deno_cache::deno_cache::init::<SqliteBackedCache>(create_cache),
-      deno_websocket::deno_websocket::init_ops::<PermissionsContainer>(
+      deno_websocket::deno_websocket::init::<PermissionsContainer>(
         options.bootstrap.user_agent.clone(),
         options.root_cert_store_provider.clone(),
         options.unsafely_ignore_certificate_errors.clone(),
       ),
-      deno_webstorage::deno_webstorage::init_ops(
+      deno_webstorage::deno_webstorage::init(
         options.origin_storage_dir.clone(),
       ),
-      deno_crypto::deno_crypto::init_ops(options.seed),
+      deno_crypto::deno_crypto::init(options.seed),
-      deno_broadcast_channel::deno_broadcast_channel::init_ops(
+      deno_broadcast_channel::deno_broadcast_channel::init(
         options.broadcast_channel.clone(),
         unstable,
       ),
-      deno_ffi::deno_ffi::init_ops::<PermissionsContainer>(unstable),
+      deno_ffi::deno_ffi::init::<PermissionsContainer>(unstable),
-      deno_net::deno_net::init_ops::<PermissionsContainer>(
+      deno_net::deno_net::init::<PermissionsContainer>(
         options.root_cert_store_provider.clone(),
         unstable,
         options.unsafely_ignore_certificate_errors.clone(),
       ),
-      deno_tls::deno_tls::init_ops(),
+      deno_tls::deno_tls::init(),
-      deno_kv::deno_kv::init_ops(
+      deno_kv::deno_kv::init(
         SqliteDbHandler::<PermissionsContainer>::new(
           options.origin_storage_dir.clone(),
         ),
         unstable,
       ),
-      deno_napi::deno_napi::init_ops::<PermissionsContainer>(),
+      deno_napi::deno_napi::init::<PermissionsContainer>(),
-      deno_http::deno_http::init_ops::<DefaultHttpPropertyExtractor>(),
+      deno_http::deno_http::init::<DefaultHttpPropertyExtractor>(),
-      deno_io::deno_io::init_ops(Some(options.stdio)),
+      deno_io::deno_io::init(Some(options.stdio)),
-      deno_fs::deno_fs::init_ops::<PermissionsContainer>(
+      deno_fs::deno_fs::init::<PermissionsContainer>(
         unstable,
         options.fs.clone(),
       ),
-      deno_node::deno_node::init_ops::<PermissionsContainer>(
+      deno_node::deno_node::init::<PermissionsContainer>(
         options.npm_resolver,
         options.fs,
       ),
       // Ops from this crate
-      ops::runtime::deno_runtime::init_ops(main_module.clone()),
+      ops::runtime::deno_runtime::init(main_module.clone()),
-      ops::worker_host::deno_worker_host::init_ops(
+      ops::worker_host::deno_worker_host::init(
         options.create_web_worker_cb.clone(),
         options.web_worker_preload_module_cb.clone(),
         options.web_worker_pre_execute_module_cb.clone(),
         options.format_js_error_fn.clone(),
       ),
-      ops::fs_events::deno_fs_events::init_ops(),
+      ops::fs_events::deno_fs_events::init(),
-      ops::os::deno_os::init_ops(exit_code.clone()),
+      ops::os::deno_os::init(exit_code.clone()),
-      ops::permissions::deno_permissions::init_ops(),
+      ops::permissions::deno_permissions::init(),
-      ops::process::deno_process::init_ops(),
+      ops::process::deno_process::init(),
-      ops::signal::deno_signal::init_ops(),
+      ops::signal::deno_signal::init(),
-      ops::tty::deno_tty::init_ops(),
+      ops::tty::deno_tty::init(),
-      ops::http::deno_http_runtime::init_ops(),
+      ops::http::deno_http_runtime::init(),
-      deno_permissions_worker::init_ops(
+      deno_permissions_worker::init(
         permissions,
         unstable,
         enable_testing_features,