Merge pull request #84 from csgibson/refactor-sass

refactor(sass): allow sass to be used as a scss compiler

Author: schmidtk

README.md

@@ -1,9 +1,9 @@
 # opensphere-build-resolver
 
-Resolves sources and other input for the Google Closure Compiler, sass for node-sass, template views for angular, and other items through a project's dependency tree.
+Resolves sources and other input for the Google Closure Compiler, scss for sass/node-sass, template views for angular, and other items through a project's dependency tree.
 
 ## Problem
-You want to use npm to manage your project and its dependencies, but you need to resolve source, css, sass, templates, or other resources from those dependencies and pass them as arguments on the command line to tools like the google-closure-compiler, node-sass, and others.
+You want to use npm to manage your project and its dependencies, but you need to resolve source, css, scss, templates, or other resources from those dependencies and pass them as arguments on the command line to tools like the google-closure-compiler, sass/node-sass, and others.
 
 ## Solution
 This.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "opensphere-build-resolver",
   "version": "8.0.0",
-  "description": "Resolves projects, their dependencies, plugins, and config to the correct arguments for compilation via the Google Closure Compiler, node-sass, and other tools.",
+  "description": "Resolves projects, their dependencies, plugins, and config to the correct arguments for compilation via the Google Closure Compiler, sass/node-sass, and other tools.",
   "bin": {
     "os-resolve": "./resolve.js"
   },

plugins/scss/index.js

@@ -156,9 +156,16 @@ const addScssRequires = function(pack, dir) {
 
 const writer = function(thisPackage, outputDir) {
   if (scssPaths.length || scssEntries.length) {
-    var options = {
-      'include-path': scssPaths
-    };
+    var options = {};
+    if ((thisPackage.build && thisPackage.build.scssCompiler === 'sass') ||
+        ((thisPackage.dependencies && thisPackage.dependencies['sass']) ||
+        (thisPackage.devDependencies && thisPackage.devDependencies['sass'])) &&
+        !((thisPackage.dependencies && thisPackage.dependencies['node-sass']) ||
+        (thisPackage.devDependencies && thisPackage.devDependencies['node-sass']))) {
+      options['load-path'] = scssPaths;
+    } else {
+      options['include-path'] = scssPaths;
+    }
 
     var args = [];
 

test/plugins/scss/scss/should-not-use-sass-when-node-sass/node-sass-args

@@ -0,0 +1 @@
+--include-path node_modules/some-scss-lib/scss

test/plugins/scss/scss/should-not-use-sass-when-node-sass/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "should-not-use-sass-when-node-sass",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "keywords": [],
+  "build": {
+    "scssPaths": ["some-scss-lib/scss"]
+  },
+  "dependencies": {
+    "node-sass": "^4.12.0",
+    "some-scss-lib": "1.0.0",
+    "sass": "^1.34.1"
+  }
+}

test/plugins/scss/scss/should-not-use-sass-when-node-sass/require-all.scss

@@ -0,0 +1 @@
+--load-path node_modules/some-scss-lib/scss

test/plugins/scss/scss/should-use-sass-when-available/node-sass-args

@@ -0,0 +1,14 @@
+{
+  "name": "should-use-sass-when-available",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "keywords": [],
+  "build": {
+    "scssPaths": ["some-scss-lib/scss"]
+  },
+  "dependencies": {
+    "some-scss-lib": "1.0.0",
+    "sass": "^1.34.1"
+  }
+}

test/plugins/scss/scss/should-use-sass-when-available/package.json

@@ -0,0 +1 @@
+--load-path node_modules/some-scss-lib/scss