summaryrefslogtreecommitdiff
path: root/runtime/build.rs
diff options
context:
space:
mode:
authorBartek Iwańczuk <biwanczuk@gmail.com>2023-06-26 13:54:10 +0200
committerGitHub <noreply@github.com>2023-06-26 13:54:10 +0200
commitad3c494b46c97f0cf91098b7ec2afa576ea7a3dd (patch)
tree2996e36708b4c726c3b5e99b6fbbd8e63fcc121b /runtime/build.rs
parentc7d38e593f7de66af47321e7463d8c15ae4176f2 (diff)
Revert "Reland "refactor(core): cleanup feature flags for js source i… (#19611)
…nclusion" (#19519)" This reverts commit 28a4f3d0f5383695b1d49ccdc8b0f799a715b2c2. This change causes failures when used outside Deno repo: ``` ============================================================ Deno has panicked. This is a bug in Deno. Please report this at https://github.com/denoland/deno/issues/new. If you can reliably reproduce this panic, include the reproduction steps and re-run with the RUST_BACKTRACE=1 env var set and include the backtrace in your report. Platform: linux x86_64 Version: 1.34.3+b37b286 Args: ["/opt/hostedtoolcache/deno/0.0.0-b37b286f7fa68d5656f7c180f6127bdc38cf2cf5/x64/deno", "test", "--doc", "--unstable", "--allow-all", "--coverage=./cov"] thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Failed to read "/home/runner/work/deno/deno/core/00_primordials.js" Caused by: No such file or directory (os error 2)', core/runtime/jsruntime.rs:699:8 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ```
Diffstat (limited to 'runtime/build.rs')
-rw-r--r--runtime/build.rs54
1 files changed, 28 insertions, 26 deletions
diff --git a/runtime/build.rs b/runtime/build.rs
index 15b7d3ade..f656682a1 100644
--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -264,22 +264,22 @@ mod startup_snapshot {
],
);
- #[cfg(not(feature = "exclude_js_main_from_snapshot"))]
+ #[cfg(not(feature = "snapshot_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: ExtensionFileSourceCode::LoadAtRuntime(PathBuf::from(
- "js/99_main.js",
- )),
+ code: deno_core::ExtensionFileSourceCode::IncludedInBinary(
+ include_str!("js/99_main.js"),
+ ),
}]);
ext.esm_entry_point("ext:runtime_main/js/99_main.js");
}
);
- #[cfg(feature = "exclude_js_main_from_snapshot")]
+ #[cfg(feature = "snapshot_from_snapshot")]
deno_core::extension!(
runtime_main,
deps = [runtime],
@@ -294,45 +294,47 @@ 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_ext(),
- deno_console::deno_console::init_ext(),
- deno_url::deno_url::init_ext(),
- deno_web::deno_web::init_ext::<Permissions>(
+ deno_webidl::deno_webidl::init_ops_and_esm(),
+ deno_console::deno_console::init_ops_and_esm(),
+ deno_url::deno_url::init_ops_and_esm(),
+ deno_web::deno_web::init_ops_and_esm::<Permissions>(
deno_web::BlobStore::default(),
Default::default(),
),
- deno_fetch::deno_fetch::init_ext::<Permissions>(Default::default()),
- deno_cache::deno_cache::init_ext::<SqliteBackedCache>(None),
- deno_websocket::deno_websocket::init_ext::<Permissions>(
+ deno_fetch::deno_fetch::init_ops_and_esm::<Permissions>(
+ Default::default(),
+ ),
+ 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_ext(None),
- deno_crypto::deno_crypto::init_ext(None),
- deno_broadcast_channel::deno_broadcast_channel::init_ext(
+ deno_webstorage::deno_webstorage::init_ops_and_esm(None),
+ deno_crypto::deno_crypto::init_ops_and_esm(None),
+ deno_broadcast_channel::deno_broadcast_channel::init_ops_and_esm(
deno_broadcast_channel::InMemoryBroadcastChannel::default(),
false, // No --unstable.
),
- deno_ffi::deno_ffi::init_ext::<Permissions>(false),
- deno_net::deno_net::init_ext::<Permissions>(
+ deno_ffi::deno_ffi::init_ops_and_esm::<Permissions>(false),
+ deno_net::deno_net::init_ops_and_esm::<Permissions>(
None, false, // No --unstable.
None,
),
- deno_tls::deno_tls::init_ext(),
- deno_kv::deno_kv::init_ext(
+ deno_tls::deno_tls::init_ops_and_esm(),
+ deno_kv::deno_kv::init_ops_and_esm(
deno_kv::sqlite::SqliteDbHandler::<Permissions>::new(None),
false, // No --unstable
),
- deno_napi::deno_napi::init_ext::<Permissions>(),
- deno_http::deno_http::init_ext::<DefaultHttpPropertyExtractor>(),
- deno_io::deno_io::init_ext(Default::default()),
- deno_fs::deno_fs::init_ext::<Permissions>(false, fs.clone()),
- runtime::init_ext(),
+ deno_napi::deno_napi::init_ops_and_esm::<Permissions>(),
+ deno_http::deno_http::init_ops_and_esm::<DefaultHttpPropertyExtractor>(),
+ deno_io::deno_io::init_ops_and_esm(Default::default()),
+ deno_fs::deno_fs::init_ops_and_esm::<Permissions>(false, fs.clone()),
+ runtime::init_ops_and_esm(),
// 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_ext::<Permissions>(None, fs),
- runtime_main::init_ext(),
+ deno_node::deno_node::init_ops_and_esm::<Permissions>(None, fs),
+ runtime_main::init_ops_and_esm(),
];
let output = create_snapshot(CreateSnapshotOptions {