Skip to content

Commit

Permalink
fix(runtime): snapshot options op missing during snapshot (#21235)
Browse files Browse the repository at this point in the history
Porting #21233 to release branch

Co-authored-by: Divy Srivastava <dj.srivastava23@gmail.com>
  • Loading branch information
kt3k and littledivy committed Nov 17, 2023
1 parent 7e56ce1 commit 118be11
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
1 change: 1 addition & 0 deletions runtime/Cargo.toml
Expand Up @@ -62,6 +62,7 @@ deno_websocket.workspace = true
deno_webstorage.workspace = true
deno_napi.workspace = true
flate2 = { workspace = true, features = ["default"] }
serde.workspace = true

[target.'cfg(windows)'.build-dependencies]
winres.workspace = true
Expand Down
22 changes: 22 additions & 0 deletions runtime/build.rs
Expand Up @@ -13,13 +13,34 @@ mod startup_snapshot {
use super::*;
use deno_cache::SqliteBackedCache;
use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::snapshot_util::*;
use deno_core::Extension;
use deno_core::OpState;
use deno_http::DefaultHttpPropertyExtractor;
use shared::maybe_transpile_source;
use shared::runtime;
use std::path::Path;

// Keep in sync with `runtime/ops/bootstrap.rs`
#[derive(serde::Serialize, Default)]
#[serde(rename_all = "camelCase")]
pub struct SnapshotOptions {
pub deno_version: String,
pub ts_version: String,
pub v8_version: &'static str,
pub target: String,
}

// TODO(@littledivy): Remove this once we get rid of deno_runtime snapshots.
#[op2]
#[serde]
pub fn op_snapshot_options(_: &mut OpState) -> SnapshotOptions {
SnapshotOptions::default()
}

deno_core::extension!(snapshot, ops = [op_snapshot_options],);

#[derive(Clone)]
struct Permissions;

Expand Down Expand Up @@ -232,6 +253,7 @@ mod startup_snapshot {
deno_fs::deno_fs::init_ops_and_esm::<Permissions>(fs.clone()),
deno_node::deno_node::init_ops_and_esm::<Permissions>(None, fs),
runtime::init_ops_and_esm(),
snapshot::init_ops_and_esm(),
];

for extension in &mut extensions {
Expand Down

0 comments on commit 118be11

Please sign in to comment.