1
1
var fs = require ( 'fs' )
2
2
, map = require ( 'map-stream' )
3
- , sass = require ( 'node-sass' )
3
+ , nodeSass = require ( 'node-sass' )
4
4
, path = require ( 'path' )
5
5
, gutil = require ( 'gulp-util' )
6
6
, clone = require ( 'clone' )
@@ -11,7 +11,7 @@ var fs = require('fs')
11
11
module . exports = function ( options ) {
12
12
var opts = options ? clone ( options ) : { } ;
13
13
14
- function nodeSass ( file , cb ) {
14
+ function sass ( file , cb ) {
15
15
var fileDir = path . dirname ( file . path ) ;
16
16
17
17
if ( file . isNull ( ) ) {
@@ -41,8 +41,6 @@ module.exports = function (options) {
41
41
opts . includePaths = [ fileDir ] ;
42
42
}
43
43
44
- opts . includePath = opts . includePaths ;
45
-
46
44
opts . success = function ( css , sourceMap ) {
47
45
if ( typeof opts . onSuccess === 'function' ) opts . onSuccess ( css , sourceMap ) ;
48
46
@@ -79,21 +77,21 @@ module.exports = function (options) {
79
77
return cb ( new gutil . PluginError ( 'gulp-sass' , err ) ) ;
80
78
} ;
81
79
82
- if ( opts . sync ) {
83
- try {
84
- var output = sass . renderSync ( opts ) ;
85
- opts . success ( output , null ) ;
86
- handleOutput ( output , file , cb ) ;
87
- } catch ( err ) {
88
- opts . error ( err ) ;
89
- }
90
- } else {
91
- sass . render ( opts ) ;
92
- }
80
+ if ( opts . sync ) {
81
+ try {
82
+ var output = nodeSass . renderSync ( opts ) ;
83
+ opts . success ( output , null ) ;
84
+ handleOutput ( output , file , cb ) ;
85
+ } catch ( err ) {
86
+ opts . error ( err ) ;
87
+ }
88
+ } else {
89
+ nodeSass . render ( opts ) ;
90
+ }
93
91
94
92
}
95
93
96
- return map ( nodeSass ) ;
94
+ return map ( sass ) ;
97
95
} ;
98
96
99
97
function handleOutput ( output , file , cb ) {
0 commit comments