fix: importing file directly from scoped npm package (#450)

* fix issue with importing file directly from scoped npm package

* Try to fix appveyor

Author: roman-vanesyan

lib/importsToResolve.js

@@ -28,13 +28,21 @@ function importsToResolve(request) {
     const basename = path.basename(request);
     const dirname = path.dirname(request);
     const startsWithUnderscore = basename.charAt(0) === "_";
-    // a module import is an identifier like 'bootstrap-sass'
-    // Firstly check whether we importing scoped npm package (i.e. "@org/pkg")
-    // We also need to check for dirname since it might also be a deep import like 'bootstrap-sass/something'
-    const isModuleImport = dirname.charAt(0) === "@" && dirname.length > 1 ? true : request.charAt(0) !== "." && dirname === ".";
     const hasCssExt = ext === ".css";
     const hasSassExt = ext === ".scss" || ext === ".sass";
 
+    // a module import is an identifier like 'bootstrap-sass'
+    // We also need to check for dirname since it might also be a deep import like 'bootstrap-sass/something'
+    let isModuleImport = request.charAt(0) !== "." && dirname === ".";
+
+    if (dirname.charAt(0) === "@") {
+        // Check whether it is a deep import from scoped npm package
+        // (i.e. @pkg/foo/file), if so, process import as file import;
+        // otherwise, if we import from root npm scoped package (i.e. @pkg/foo)
+        // process import as a module import.
+        isModuleImport = !(dirname.indexOf("/") > -1);
+    }
+
     return (isModuleImport && [request]) || // Do not modify module imports
         (hasCssExt && []) || // Do not import css files
         (hasSassExt && [request]) || // Do not modify imports with explicit extensions

test/node_modules/@org/bar/_foo.scss

@@ -1,5 +1,7 @@
-/* @import "~@org/pkg"; */
-@import "~@org/pkg";
+/* @import ~@org/pkg */
+@import ~@org/pkg
+/* @import ~@org/bar/foo */
+@import ~@org/bar/foo
 
 .foo
     background: #000;

test/sass/import-from-npm-org-pkg.sass

@@ -1,5 +1,7 @@
 /* @import "~@org/pkg"; */
 @import "~@org/pkg";
+/* @import "~@org/bar/foo"; */
+@import "~@org/bar/foo";
 
 .foo {
     background: #000;