language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-03 02:22:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Dynamic import (#2516)

Browse source
This commit is contained in:
Bert Belder 2019-08-07 18:55:39 +02:00
parent 56a82e72d9
commit 6fbf2e9624
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
16 changed files with 716 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/state.rs
View file

@ -118,9 +118,9 @@ impl Loader for ThreadSafeState {
&self,
specifier: &str,
referrer: &str,
is_root: bool,
is_main: bool,
) -> Result<ModuleSpecifier, ErrBox> {
if !is_root {
if !is_main {
if let Some(import_map) = &self.import_map {
let result = import_map.resolve(specifier, referrer)?;
if result.is_some() {
@ -138,12 +138,14 @@ impl Loader for ThreadSafeState {
module_specifier: &ModuleSpecifier,
) -> Box<deno::SourceCodeInfoFuture> {
self.metrics.resolve_count.fetch_add(1, Ordering::SeqCst);
let module_url_specified = module_specifier.to_string();
Box::new(self.fetch_compiled_module(module_specifier).map(
|compiled_module| deno::SourceCodeInfo {
// Real module name, might be different from initial specifier
// due to redirections.
code: compiled_module.code,
module_name: compiled_module.name,
module_url_specified,
module_url_found: compiled_module.name,
},
))
}