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 --- deno_typescript/ops.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'deno_typescript/ops.rs') diff --git a/deno_typescript/ops.rs b/deno_typescript/ops.rs index f1c7840f9..ca7c08548 100644 --- a/deno_typescript/ops.rs +++ b/deno_typescript/ops.rs @@ -108,8 +108,12 @@ fn resolve_module_names(_s: &mut TSState, v: Value) -> Result { let mut resolved = Vec::::new(); let referrer = ModuleSpecifier::resolve_url_or_path(&v.containing_file)?; for specifier in v.module_names { - let ms = ModuleSpecifier::resolve_import(&specifier, referrer.as_str())?; - resolved.push(ms.as_str().to_string()); + if specifier.starts_with("$asset$/") { + resolved.push(specifier.clone()); + } else { + let ms = ModuleSpecifier::resolve_import(&specifier, referrer.as_str())?; + resolved.push(ms.as_str().to_string()); + } } Ok(json!(resolved)) } -- cgit v1.2.3