Handle typescript version in rust (#2855)

3 files changed, 10 insertions, 16 deletions

diff --git a/js/main.ts b/js/main.ts
index 31a7647df..6ce3551ac 100644
--- a/js/main.ts
+++ b/js/main.ts
@@ -1,5 +1,4 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-
 import "./globals.ts";
 
 import { assert, log } from "./util.ts";
@@ -11,21 +10,11 @@ import { xevalMain, XevalFunc } from "./xeval.ts";
 import { setVersions } from "./version.ts";
 import { window } from "./window.ts";
 import { setLocation } from "./location.ts";
-import * as Deno from "./deno.ts";
 
 function denoMain(preserveDenoNamespace: boolean = true, name?: string): void {
   const s = os.start(preserveDenoNamespace, name);
 
-  setVersions(s.denoVersion, s.v8Version);
-
-  // handle `--version`
-  if (s.versionFlag) {
-    const { console } = window;
-    console.log("deno:", Deno.version.deno);
-    console.log("v8:", Deno.version.v8);
-    console.log("typescript:", Deno.version.typescript);
-    os.exit(0);
-  }
+  setVersions(s.denoVersion, s.v8Version, s.tsVersion);
 
   setPrepareStackTrace(Error);
 
diff --git a/js/os.ts b/js/os.ts
index dbfbf3c88..b5392fc33 100644
--- a/js/os.ts
+++ b/js/os.ts
@@ -59,6 +59,7 @@ interface Start {
   versionFlag: boolean;
   denoVersion: string;
   v8Version: string;
+  tsVersion: string;
   noColor: boolean;
   xevalDelim: string;
 }
diff --git a/js/version.ts b/js/version.ts
index 3ceade24e..08ac58122 100644
--- a/js/version.ts
+++ b/js/version.ts
@@ -8,17 +8,21 @@ interface Version {
 export const version: Version = {
   deno: "",
   v8: "",
-  // This string will be replaced by rollup
-  typescript: `DENO_REPLACE_TS_VERSION`
+  typescript: ""
 };
 
 /**
- * Sets the deno and v8 versions and freezes the version object.
+ * Sets the deno, v8, and typescript versions and freezes the version object.
  * @internal
  */
-export function setVersions(denoVersion: string, v8Version: string): void {
+export function setVersions(
+  denoVersion: string,
+  v8Version: string,
+  tsVersion: string
+): void {
   version.deno = denoVersion;
   version.v8 = v8Version;
+  version.typescript = tsVersion;
 
   Object.freeze(version);
 }