From c9ef182886cc07d35a5b27fb89163d8cf21a6a47 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
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/main.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'cli/main.rs')

diff --git a/cli/main.rs b/cli/main.rs
index 554a36e59..e535b70bd 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -9,7 +9,7 @@ extern crate futures;
 extern crate serde_json;
 extern crate clap;
 extern crate deno;
-extern crate deno_typescript;
+extern crate deno_cli_snapshots;
 extern crate indexmap;
 #[cfg(unix)]
 extern crate nix;
@@ -21,7 +21,6 @@ extern crate url;
 #[cfg(test)]
 mod integration_tests;
 
-mod assets;
 mod colors;
 pub mod compilers;
 pub mod deno_dir;
@@ -133,7 +132,7 @@ fn create_worker_and_state(
 }
 
 fn types_command() {
-  let content = assets::get_source_code("lib.deno_runtime.d.ts").unwrap();
+  let content = deno_cli_snapshots::get_asset("lib.deno_runtime.d.ts").unwrap();
   println!("{}", content);
 }
 
@@ -405,7 +404,7 @@ fn run_script(flags: DenoFlags, argv: Vec<String>) {
 fn version_command() {
   println!("deno: {}", version::DENO);
   println!("v8: {}", version::v8());
-  println!("typescript: {}", version::typescript());
+  println!("typescript: {}", version::TYPESCRIPT);
 }
 
 fn main() {
-- 
cgit v1.2.3