README.md

@@ -311,9 +311,11 @@ Used to determine how many digits after the decimal will be allowed. For instanc
 * Type: `Boolean | String | undefined`
 * Default: `undefined`
 
-**Special:** Setting the `sourceMap` option requires also setting the `outFile` option
+Enables source map generation during `render` and `renderSync`.
 
-Enables the outputting of a source map during `render` and `renderSync`. When `sourceMap === true`, the value of `outFile` is used as the target output location for the source map. When `typeof sourceMap === "string"`, the value of `sourceMap` will be used as the writing location for the file.
+When `sourceMap === true`, the value of `outFile` is used as the target output location for the source map with the suffix `.map` appended. If no `outFile` is set, `sourceMap` parameter is ignored.
+
+When `typeof sourceMap === "string"`, the value of `sourceMap` will be used as the writing location for the file.
 
 ### sourceMapContents
 
@@ -422,7 +424,7 @@ var result = sass.renderSync({
     var result = someSyncFunction(url, prev);
     return {file: result.path, contents: result.data};
   }
-}));
+});
 
 console.log(result.css);
 console.log(result.map);

lib/index.js

@@ -300,9 +300,11 @@ module.exports.render = function(opts, cb) {
     var stats = endStats(result.stats);
     var payload = {
       css: result.css,
-      map: result.map,
       stats: stats
     };
+    if (result.map) {
+      payload.map = result.map;
+    }
 
     if (cb) {
       options.context.callback.call(options.context, null, payload);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sass",
-  "version": "4.13.0",
+  "version": "4.13.1",
   "libsass": "3.5.4",
   "description": "Wrapper around libsass",
   "license": "MIT",

src/custom_importer_bridge.cpp

@@ -13,11 +13,12 @@ SassImportList CustomImporterBridge::post_process_return_value(v8::Local<v8::Val
     imports = sass_make_import_list(array->Length());
 
     for (size_t i = 0; i < array->Length(); ++i) {
-      v8::Local<v8::Value> value = Nan::Get(array, static_cast<uint32_t>(i)).ToLocalChecked();
+      v8::Local<v8::Value> value;
+      Nan::MaybeLocal<v8::Value> unchecked = Nan::Get(array, static_cast<uint32_t>(i));
 
-      if (!value->IsObject()) {
-        auto entry = sass_make_import_entry(0, 0, 0);
-        sass_import_set_error(entry, "returned array must only contain object literals", -1, -1);
+      if (!unchecked.ToLocal(&value) || !value->IsObject()) {
+        imports[i] = sass_make_import_entry(0, 0, 0);
+        sass_import_set_error(imports[i], "returned array must only contain object literals", -1, -1);
         continue;
       }
 
@@ -71,9 +72,9 @@ Sass_Import* CustomImporterBridge::check_returned_string(Nan::MaybeLocal<v8::Val
 }
 
 Sass_Import* CustomImporterBridge::get_importer_entry(const v8::Local<v8::Object>& object) const {
-  auto returned_file = Nan::Get(object, Nan::New<v8::String>("file").ToLocalChecked());
-  auto returned_contents = Nan::Get(object, Nan::New<v8::String>("contents").ToLocalChecked()).ToLocalChecked();
-  auto returned_map = Nan::Get(object, Nan::New<v8::String>("map").ToLocalChecked());
+  Nan::MaybeLocal<v8::Value> returned_file = Nan::Get(object, Nan::New<v8::String>("file").ToLocalChecked());
+  Nan::MaybeLocal<v8::Value> returned_contents = Nan::Get(object, Nan::New<v8::String>("contents").ToLocalChecked());
+  Nan::MaybeLocal<v8::Value> returned_map = Nan::Get(object, Nan::New<v8::String>("map").ToLocalChecked());
   Sass_Import *err;
 
   if ((err = check_returned_string(returned_file, "returned value of `file` must be a string")))

test/api.js

@@ -63,6 +63,26 @@ describe('api', function() {
       });
     });
 
+    it('should not generate source map when not requested', function(done) {
+      sass.render({
+        file: fixture('simple/index.scss'),
+        sourceMap: false
+      }, function(error, result) {
+        assert.strictEqual(result.hasOwnProperty('map'), false, 'result has a map property');
+        done();
+      });
+    });
+
+    it('should not generate source map without outFile and no explicit path given', function(done) {
+      sass.render({
+        file: fixture('simple/index.scss'),
+        sourceMap: true
+      }, function(error, result) {
+        assert.strictEqual(result.hasOwnProperty('map'), false, 'result has a map property');
+        done();
+      });
+    });
+
     it('should compile generate map with sourceMapRoot pass-through option', function(done) {
       sass.render({
         file: fixture('simple/index.scss'),
@@ -1348,6 +1368,26 @@ describe('api', function() {
       done();
     });
 
+    it('should not generate source map when not requested', function(done) {
+      var result =  sass.renderSync({
+        file: fixture('simple/index.scss'),
+        sourceMap: false
+      });
+
+      assert.strictEqual(result.hasOwnProperty('map'), false, 'result has a map property');
+      done();
+    });
+
+    it('should not generate source map without outFile and no explicit path given', function(done) {
+      var result =  sass.renderSync({
+        file: fixture('simple/index.scss'),
+        sourceMap: true
+      });
+
+      assert.strictEqual(result.hasOwnProperty('map'), false, 'result has a map property');
+      done();
+    });
+
     it('should compile generate map with sourceMapRoot pass-through option', function(done) {
       var result = sass.renderSync({
         file: fixture('simple/index.scss'),