Fix importing css files from sass/scss

Fixes webpack-contrib#101

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 ---------
 
+### ????
+
+- Fix importing css files from scss/sass
+
 ### 1.0.2
 
 - Fix a bug where files could not be imported across language styles [#73](https://github.com/jtangelder/sass-loader/issues/73)

index.js

@@ -27,7 +27,7 @@ module.exports = function (content) {
     var isSync = typeof callback !== 'function';
     var self = this;
     var resourcePath = this.resourcePath;
-    var extensionMatcher = /\.(sass|scss)$/;
+    var extensionMatcher = /\.(sass|scss|css)$/;
     var fileExt;
     var opt;
     var contextMatch;

test/prepare.js

@@ -6,12 +6,13 @@ var path = require('path');
 
 var error = 'error';
 var filesWithTildeImports = [
-    'imports', 'underscore-imports'
+    'imports', 'underscore-imports', 'import-other-style'
 ];
 
 ['scss', 'sass'].forEach(function (ext) {
     var files = [];
     var basePath = path.join(__dirname, ext);
+    var nodeModulesPath = path.join(__dirname, 'node_modules') + '/';
 
     fs.readdirSync(path.join(__dirname, ext))
         .filter(function (file) {
@@ -27,7 +28,7 @@ var filesWithTildeImports = [
                 // We need to replace all occurrences of '~' with relative paths
                 // so node-sass finds the imported files without webpack's resolving algorithm
                 fileContent = fs.readFileSync(fileName, 'utf8');
-                fileContent = fileContent.replace('~', '../node_modules/');
+                fileContent = fileContent.replace('~', nodeModulesPath);
                 fs.writeFileSync(fileName, fileContent, 'utf8');
             }
 
@@ -43,7 +44,7 @@ var filesWithTildeImports = [
             if (filesWithTildeImports.indexOf(fileWithoutExt) > -1) {
                 // Revert back our changes and add '~' again
                 fileContent = fs.readFileSync(fileName, 'utf8');
-                fileContent = fileContent.replace('../node_modules/', '~');
+                fileContent = fileContent.replace(nodeModulesPath, '~');
                 fs.writeFileSync(fileName, fileContent, 'utf8');
             }
 

test/sass/import-other-style.sass

@@ -1,2 +1,3 @@
 // Importing the other language style requires the file extension to be set explicitly
 @import ../scss/another/module.scss
+@import ~some-module.css

test/scss/import-other-style.scss

@@ -1,2 +1,3 @@
 // Importing the other language style requires the file extension to be set explicitly
 @import "../sass/another/module.sass";
+@import "~some-module.css";