update packages

1 files changed, 18 insertions, 5 deletions

diff --git a/node_modules/concat-with-sourcemaps/index.js b/node_modules/concat-with-sourcemaps/index.js
index a46fa2386..8059e8a7d 100644
--- a/node_modules/concat-with-sourcemaps/index.js
+++ b/node_modules/concat-with-sourcemaps/index.js
@@ -13,9 +13,9 @@ function Concat(generateSourceMap, fileName, separator) {
   this.contentParts = [];
 
   if (separator === undefined) {
-    this.separator = new Buffer(0);
+    this.separator = bufferFrom('');
   } else {
-    this.separator = new Buffer(separator);
+    this.separator = bufferFrom(separator);
   }
 
   if (this.sourceMapping) {
@@ -37,7 +37,7 @@ Concat.prototype.add = function(filePath, content, sourceMap) {
   filePath = filePath && unixStylePath(filePath);
 
   if (!Buffer.isBuffer(content)) {
-    content = new Buffer(content);
+    content = bufferFrom(content);
   }
 
   if (this.contentParts.length !== 0) {
@@ -62,11 +62,11 @@ Concat.prototype.add = function(filePath, content, sourceMap) {
               line: _this.lineOffset + mapping.generatedLine,
               column: (mapping.generatedLine === 1 ? _this.columnOffset : 0) + mapping.generatedColumn
             },
-            original: {
+            original: mapping.originalLine == null ? null : {
               line: mapping.originalLine,
               column: mapping.originalColumn
             },
-            source: mapping.source,
+            source: mapping.originalLine != null ? mapping.source : null,
             name: mapping.name
           });
         }
@@ -118,4 +118,17 @@ Object.defineProperty(Concat.prototype, 'sourceMap', {
   }
 });
 
+function bufferFrom(content) {
+  try {
+    return Buffer.from(content);
+  } catch(e) {
+    if (Object.prototype.toString.call(content) !== '[object String]') {
+      throw new TypeError("separator must be a string");
+    }
+    return new Buffer(content);
+  }
+}
+Concat.bufferFrom = bufferFrom;
+Concat.default = Concat;
+
 module.exports = Concat;