Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: rename __runtime_js_source to hmr #24442

Merged
merged 1 commit into from
Jul 5, 2024
Merged

chore: rename __runtime_js_source to hmr #24442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 44,7 @@ default = ["upgrade", "__vendored_zlib_ng"]
upgrade = []
# A dev feature to disable creations and loading of snapshots in favor of
# loading JS sources at runtime.
__runtime_js_sources = ["deno_runtime/__runtime_js_sources"]
hmr = ["deno_runtime/hmr"]
# Vendor zlib as zlib-ng
__vendored_zlib_ng = ["flate2/zlib-ng-compat", "libz-sys/zlib-ng"]

Expand Down
4 changes: 2 additions & 2 deletions cli/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 325,7 @@ mod ts {
}
}

#[cfg(not(feature = "__runtime_js_sources"))]
#[cfg(not(feature = "hmr"))]
fn create_cli_snapshot(snapshot_path: PathBuf) {
use deno_runtime::ops::bootstrap::SnapshotOptions;

Expand Down Expand Up @@ -469,7 469,7 @@ fn main() {
let compiler_snapshot_path = o.join("COMPILER_SNAPSHOT.bin");
ts::create_compiler_snapshot(compiler_snapshot_path, &c);

#[cfg(not(feature = "__runtime_js_sources"))]
#[cfg(not(feature = "hmr"))]
{
let cli_snapshot_path = o.join("CLI_SNAPSHOT.bin");
create_cli_snapshot(cli_snapshot_path);
Expand Down
6 changes: 3 additions & 3 deletions cli/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 2,17 @@

use log::debug;

#[cfg(not(feature = "__runtime_js_sources"))]
#[cfg(not(feature = "hmr"))]
static CLI_SNAPSHOT: &[u8] =
include_bytes!(concat!(env!("OUT_DIR"), "/CLI_SNAPSHOT.bin"));

pub fn deno_isolate_init() -> Option<&'static [u8]> {
debug!("Deno isolate init with snapshots.");
#[cfg(not(feature = "__runtime_js_sources"))]
#[cfg(not(feature = "hmr"))]
{
Some(CLI_SNAPSHOT)
}
#[cfg(feature = "__runtime_js_sources")]
#[cfg(feature = "hmr")]
{
None
}
Expand Down
2 changes: 1 addition & 1 deletion runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 22,7 @@ include_js_files_for_snapshotting = [
]
# A dev feature to disable creations and loading of snapshots in favor of
# loading JS sources at runtime.
__runtime_js_sources = ["include_js_files_for_snapshotting"]
hmr = ["include_js_files_for_snapshotting"]
# Signal that only snapshotted JS sources should be used. This will
# conditionally exclude the runtime source transpilation logic, and add an
# assertion that a snapshot is provided.
Expand Down
7 changes: 5 additions & 2 deletions runtime/web_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 518,11 @@ impl WebWorker {
ops::web_worker::deno_web_worker::init_ops_and_esm(),
];

#[cfg(__runtime_js_sources)]
assert!(cfg!(not(feature = "only_snapshotted_js_sources")), "'__runtime_js_sources' is incompatible with 'only_snapshotted_js_sources'.");
#[cfg(hmr)]
assert!(
cfg!(not(feature = "only_snapshotted_js_sources")),
"'hmr' is incompatible with 'only_snapshotted_js_sources'."
);

for extension in &mut extensions {
if options.startup_snapshot.is_some() {
Expand Down
7 changes: 5 additions & 2 deletions runtime/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 454,11 @@ impl MainWorker {
ops::web_worker::deno_web_worker::init_ops_and_esm().disable(),
];

#[cfg(__runtime_js_sources)]
assert!(cfg!(not(feature = "only_snapshotted_js_sources")), "'__runtime_js_sources' is incompatible with 'only_snapshotted_js_sources'.");
#[cfg(hmr)]
assert!(
cfg!(not(feature = "only_snapshotted_js_sources")),
"'hmr' is incompatible with 'only_snapshotted_js_sources'."
);

for extension in &mut extensions {
if options.startup_snapshot.is_some() {
Expand Down