summaryrefslogtreecommitdiff
path: root/cli/standalone.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2021-06-22 01:45:41 +0200
committerGitHub <noreply@github.com>2021-06-22 01:45:41 +0200
commit9105892ec8b454571c56883eace557eee25b3301 (patch)
tree965d90e3a885c2f870f58eef921d8811a9a491b9 /cli/standalone.rs
parenta5eb2dfc93afc2899ed6e1ad2b3e029157889f7c (diff)
refactor: unify JavaScript script execution method (#11043)
This commit renames "JsRuntime::execute" to "JsRuntime::execute_script". Additionally same renames were applied to methods on "deno_runtime::Worker" and "deno_runtime::WebWorker". A new macro was added to "deno_core" called "located_script_name" which returns the name of Rust file alongside line no and col no of that call site. This macro is useful in combination with "JsRuntime::execute_script" and allows to provide accurate place where "one-off" JavaScript scripts are executed for internal runtime functions. Co-authored-by: Nayeem Rahman <nayeemrmn99@gmail.com>
Diffstat (limited to 'cli/standalone.rs')
-rw-r--r--cli/standalone.rs11
1 files changed, 9 insertions, 2 deletions
diff --git a/cli/standalone.rs b/cli/standalone.rs
index 796211198..fa8c5a7ee 100644
--- a/cli/standalone.rs
+++ b/cli/standalone.rs
@@ -13,6 +13,7 @@ use deno_core::error::uri_error;
use deno_core::error::AnyError;
use deno_core::error::Context;
use deno_core::futures::FutureExt;
+use deno_core::located_script_name;
use deno_core::resolve_url;
use deno_core::serde::Deserialize;
use deno_core::serde::Serialize;
@@ -262,9 +263,15 @@ pub async fn run(
}
worker.bootstrap(&options);
worker.execute_module(&main_module).await?;
- worker.execute("window.dispatchEvent(new Event('load'))")?;
+ worker.execute_script(
+ &located_script_name!(),
+ "window.dispatchEvent(new Event('load'))",
+ )?;
worker.run_event_loop(true).await?;
- worker.execute("window.dispatchEvent(new Event('unload'))")?;
+ worker.execute_script(
+ &located_script_name!(),
+ "window.dispatchEvent(new Event('unload'))",
+ )?;
std::process::exit(0);
}