language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-14 22:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "don't include assets in binary (#3661)"

Browse source 
Ref #3712

This reverts commit 32cbcfe4e9.
This commit is contained in:
Ry Dahl 2020-01-21 10:24:02 -05:00 • committed by GitHub
parent 159ac525ae
commit 229eb292f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/lib.rs
View file

@ -146,7 +146,7 @@ fn create_worker_and_state(
} }
fn types_command() { fn types_command() {
let content = include_str!("./js/lib.deno_runtime.d.ts"); let content = deno_typescript::get_asset("lib.deno_runtime.d.ts").unwrap();
println!("{}", content); println!("{}", content);
} }

27
deno_typescript/lib.rs
View file

@ -241,7 +241,7 @@ fn write_snapshot(
} }
/// Same as get_asset() but returns NotFound intead of None. /// 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) { match get_asset(name) {
Some(a) => Ok(a), Some(a) => Ok(a),
None => Err( None => Err(
@ -251,23 +251,18 @@ pub fn get_asset2(name: &str) -> Result<String, ErrBox> {
} }
} }
fn read_file(name: &str) -> String { pub fn get_asset(name: &str) -> Option<&'static str> {
fs::read_to_string(name).unwrap() macro_rules! inc {
} ($e:expr) => {
Some(include_str!(concat!("typescript/lib/", $e)))
macro_rules! inc { };
($e:expr) => { }
Some(read_file(concat!("../deno_typescript/typescript/lib/", $e)))
};
}
pub fn get_asset(name: &str) -> Option<String> {
match name { match name {
"bundle_loader.js" => { "bundle_loader.js" => Some(include_str!("bundle_loader.js")),
Some(read_file("../deno_typescript/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\");"),
"bootstrap.ts" => Some("console.log(\"hello deno\");".to_string()),
"typescript.d.ts" => inc!("typescript.d.ts"), "typescript.d.ts" => inc!("typescript.d.ts"),
"lib.esnext.d.ts" => inc!("lib.esnext.d.ts"), "lib.esnext.d.ts" => inc!("lib.esnext.d.ts"),
"lib.es2020.d.ts" => inc!("lib.es2020.d.ts"), "lib.es2020.d.ts" => inc!("lib.es2020.d.ts"),

2
deno_typescript/ops.rs
View file

@ -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 v: ReadFile = serde_json::from_value(v)?;
let (module_name, source_code) = if v.file_name.starts_with("$asset$/") { let (module_name, source_code) = if v.file_name.starts_with("$asset$/") {
let asset = v.file_name.replace("$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) (asset, source_code)
} else { } else {
assert!(!v.file_name.starts_with("$assets$"), "you meant $asset$"); assert!(!v.file_name.starts_with("$assets$"), "you meant $asset$");