From 9b1997b8b6f82e17e42c43aae3621e2b932f5843 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 8 Jul 2019 09:55:24 +0200 Subject: core: clearly define when module lookup is path-based vs URL-based The rules are now as follows: * In `import` statements, as mandated by the WHATWG specification, the import specifier is always treated as a URL. If it is a relative URL, it must start with either / or ./ or ../ * A script name passed to deno as a command line argument may be either an absolute URL or a local path. - If the name starts with a valid URI scheme followed by a colon, e.g. 'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a URL (even if Deno doesn't support the indicated protocol). - Otherwise, the script name is interpreted as a local path. The local path may be relative, and operating system semantics determine how it is resolved. Prefixing a relative path with ./ is not required. --- cli/import_map.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cli/import_map.rs') diff --git a/cli/import_map.rs b/cli/import_map.rs index 4321cacad..44525f7a2 100644 --- a/cli/import_map.rs +++ b/cli/import_map.rs @@ -178,9 +178,7 @@ impl ImportMap { continue; } - let normalized_address = ModuleSpecifier::resolve(&url_string, ".") - .expect("Address should be valid module specifier"); - normalized_addresses.push(normalized_address); + normalized_addresses.push(url.into()); } normalized_addresses -- cgit v1.2.3