Skip to content

Commit e1fc158

Browse files
committed
fix: Flatten sourceMap folder detection
CodeQL was flagging the second `else if`.
1 parent 0d6c3cc commit e1fc158

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

bin/node-sass

+7-7
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,15 @@ function getOptions(args, options) {
204204
options.sourceMapOriginal = options.sourceMap;
205205
}
206206

207-
// check if sourceMap path ends with .map to avoid isDirectory false-positive
208-
var sourceMapIsDirectory = options.sourceMapOriginal.indexOf('.map', options.sourceMapOriginal.length - 4) === -1 && isDirectory(options.sourceMapOriginal);
209-
210207
if (options.sourceMapOriginal === 'true') {
211208
options.sourceMap = options.dest + '.map';
212-
} else if (!sourceMapIsDirectory) {
213-
options.sourceMap = path.resolve(options.sourceMapOriginal);
214-
} else if (sourceMapIsDirectory) {
215-
if (!options.directory) {
209+
} else {
210+
// check if sourceMap path ends with .map to avoid isDirectory false-positive
211+
var sourceMapIsDirectory = options.sourceMapOriginal.indexOf('.map', options.sourceMapOriginal.length - 4) === -1 && isDirectory(options.sourceMapOriginal);
212+
213+
if (!sourceMapIsDirectory) {
214+
options.sourceMap = path.resolve(options.sourceMapOriginal);
215+
} else if (!options.directory) {
216216
options.sourceMap = path.resolve(options.sourceMapOriginal, path.basename(options.dest) + '.map');
217217
} else {
218218
sassDir = path.resolve(options.directory);

0 commit comments

Comments
 (0)