From 229eb292f83dedbc32dc24f912841caf79a53e9c Mon Sep 17 00:00:00 2001
From: Ry Dahl <ry@tinyclouds.org>
Date: Tue, 21 Jan 2020 10:24:02 -0500
Subject: Revert "don't include assets in binary (#3661)"

Ref #3712

This reverts commit 32cbcfe4e9943a0318c497188e045d23c5f6703a.
---
 deno_typescript/lib.rs | 27 +++++++++++----------------
 deno_typescript/ops.rs |  2 +-
 2 files changed, 12 insertions(+), 17 deletions(-)

(limited to 'deno_typescript')

diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index 370079fa1..c503d3508 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -241,7 +241,7 @@ fn write_snapshot(
 }
 
 /// Same as get_asset() but returns NotFound intead of None.
-pub fn get_asset2(name: &str) -> Result<String, ErrBox> {
+pub fn get_asset2(name: &str) -> Result<&'static str, ErrBox> {
   match get_asset(name) {
     Some(a) => Ok(a),
     None => Err(
@@ -251,23 +251,18 @@ pub fn get_asset2(name: &str) -> Result<String, ErrBox> {
   }
 }
 
-fn read_file(name: &str) -> String {
-  fs::read_to_string(name).unwrap()
-}
-
-macro_rules! inc {
-  ($e:expr) => {
-    Some(read_file(concat!("../deno_typescript/typescript/lib/", $e)))
-  };
-}
-
-pub fn get_asset(name: &str) -> Option<String> {
+pub fn get_asset(name: &str) -> Option<&'static str> {
+  macro_rules! inc {
+    ($e:expr) => {
+      Some(include_str!(concat!("typescript/lib/", $e)))
+    };
+  }
   match name {
-    "bundle_loader.js" => {
-      Some(read_file("../deno_typescript/bundle_loader.js"))
+    "bundle_loader.js" => Some(include_str!("bundle_loader.js")),
+    "lib.deno_runtime.d.ts" => {
+      Some(include_str!("../cli/js/lib.deno_runtime.d.ts"))
     }
-    "lib.deno_runtime.d.ts" => Some(read_file("js/lib.deno_runtime.d.ts")),
-    "bootstrap.ts" => Some("console.log(\"hello deno\");".to_string()),
+    "bootstrap.ts" => Some("console.log(\"hello deno\");"),
     "typescript.d.ts" => inc!("typescript.d.ts"),
     "lib.esnext.d.ts" => inc!("lib.esnext.d.ts"),
     "lib.es2020.d.ts" => inc!("lib.es2020.d.ts"),
diff --git a/deno_typescript/ops.rs b/deno_typescript/ops.rs
index c64b709b6..d557b9b8c 100644
--- a/deno_typescript/ops.rs
+++ b/deno_typescript/ops.rs
@@ -45,7 +45,7 @@ pub fn read_file(_s: &mut TSState, v: Value) -> Result<Value, ErrBox> {
   let v: ReadFile = serde_json::from_value(v)?;
   let (module_name, source_code) = if v.file_name.starts_with("$asset$/") {
     let asset = v.file_name.replace("$asset$/", "");
-    let source_code = crate::get_asset2(&asset)?;
+    let source_code = crate::get_asset2(&asset)?.to_string();
     (asset, source_code)
   } else {
     assert!(!v.file_name.starts_with("$assets$"), "you meant $asset$");
-- 
cgit v1.2.3