Automatically handle absolute URLs for FileImporters

See sass/sass#3181
sass · Oct 6, 2021 · a29cbcf · a29cbcf
1 parent 4c85589
commit a29cbcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/src/importer/node_to_dart/async_file.dart b/lib/src/importer/node_to_dart/async_file.dart
@@ -30,7 +30,8 @@ class NodeToDartAsyncFileImporter extends AsyncImporter {
   NodeToDartAsyncFileImporter(this._findFileUrl);
 
   FutureOr<Uri?> canonicalize(Uri url) async {
-    if (url.scheme != 'file' && url.scheme != '') return null;
+    if (url.scheme == 'file') return _filesystemImporter.canonicalize(url);
+    if (url.scheme != '') return null;
 
     var result = _findFileUrl(
         url.toString(), CanonicalizeOptions(fromImport: fromImport));

diff --git a/lib/src/importer/node_to_dart/file.dart b/lib/src/importer/node_to_dart/file.dart
@@ -27,7 +27,8 @@ class NodeToDartFileImporter extends Importer {
   NodeToDartFileImporter(this._findFileUrl);
 
   Uri? canonicalize(Uri url) {
-    if (url.scheme != 'file' && url.scheme != '') return null;
+    if (url.scheme == 'file') return _filesystemImporter.canonicalize(url);
+    if (url.scheme != '') return null;
 
     var result = _findFileUrl(
         url.toString(), CanonicalizeOptions(fromImport: fromImport));