From c9ef182886cc07d35a5b27fb89163d8cf21a6a47 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 15 Sep 2019 18:36:27 -0400 Subject: Make deno_cli installable via crates.io (#2946) - Fixes cargo publish on deno_typescript, deno_cli_snapshots, and deno_cli. - Combines cli_snapshots and js into one directory. - Extracts TS version at compile time rather than runtime - Bumps version awkwardly - it was necessary to test end-to-end publishing. Sorry. - Adds git submodule deno_typescript/typescript --- cli/ops/compiler.rs | 3 +-- cli/ops/os.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'cli/ops') diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs index 975e01ee1..2dd7422df 100644 --- a/cli/ops/compiler.rs +++ b/cli/ops/compiler.rs @@ -1,6 +1,5 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. use super::dispatch_json::{Deserialize, JsonOp, Value}; -use crate::assets; use crate::state::ThreadSafeState; use crate::tokio_util; use deno::*; @@ -89,7 +88,7 @@ pub fn op_fetch_asset( _zero_copy: Option, ) -> Result { let args: FetchAssetArgs = serde_json::from_value(args)?; - if let Some(source_code) = assets::get_source_code(&args.name) { + if let Some(source_code) = deno_cli_snapshots::get_asset(&args.name) { Ok(JsonOp::Sync(json!(source_code))) } else { panic!("op_fetch_asset bad asset {}", args.name) diff --git a/cli/ops/os.rs b/cli/ops/os.rs index e44f0c5f2..d033dc9c3 100644 --- a/cli/ops/os.rs +++ b/cli/ops/os.rs @@ -38,7 +38,7 @@ pub fn op_start( "versionFlag": state.flags.version, "v8Version": version::v8(), "denoVersion": version::DENO, - "tsVersion": version::typescript(), + "tsVersion": version::TYPESCRIPT, "noColor": !colors::use_color(), "xevalDelim": state.flags.xeval_delim.clone(), "os": BUILD_OS, -- cgit v1.2.3