Skip to content

Commit

Permalink
chore(cli): remove extract_standalone path from CLI (denoland#23982)
Browse files Browse the repository at this point in the history
No longer needed as standalone binaries use `denort`
  • Loading branch information
littledivy committed May 26, 2024
1 parent b21004b commit 16ed81f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 24 deletions.
29 changes: 5 additions & 24 deletions cli/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ use deno_runtime::fmt_errors::format_js_error;
use deno_runtime::tokio_util::create_and_run_current_thread_with_maybe_metrics;
use deno_terminal::colors;
use factory::CliFactory;
use std::borrow::Cow;
use std::env;
use std::env::current_exe;
use std::future::Future;
use std::path::PathBuf;

Expand Down Expand Up @@ -331,29 +329,12 @@ pub fn main() {
);

let args: Vec<_> = env::args_os().collect();
let current_exe_path = current_exe().unwrap();
let maybe_standalone = match standalone::extract_standalone(
&current_exe_path,
Cow::Borrowed(&args),
) {
Ok(standalone) => standalone,
Err(err) => exit_for_error(err),
};

let future = async move {
match maybe_standalone {
Some(future) => {
let (metadata, eszip) = future.await?;
standalone::run(eszip, metadata).await
}
None => {
// NOTE(lucacasonato): due to new PKU feature introduced in V8 11.6 we need to
// initialize the V8 platform on a parent thread of all threads that will spawn
// V8 isolates.
let flags = resolve_flags_and_init(args)?;
run_subcommand(flags).await
}
}
// NOTE(lucacasonato): due to new PKU feature introduced in V8 11.6 we need to
// initialize the V8 platform on a parent thread of all threads that will spawn
// V8 isolates.
let flags = resolve_flags_and_init(args)?;
run_subcommand(flags).await
};

match create_and_run_current_thread_with_maybe_metrics(future) {
Expand Down
5 changes: 5 additions & 0 deletions cli/standalone/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.

// Allow unused code warnings because we share
// code between the two bin targets.
#![allow(dead_code)]
#![allow(unused_imports)]

use crate::args::create_default_npmrc;
use crate::args::get_root_cert_store;
use crate::args::npm_pkg_req_ref_to_binary_command;
Expand Down

0 comments on commit 16ed81f

Please sign in to comment.