Merge cherry-pick

Author: nmccready

.travis.yml

@@ -1,23 +1,11 @@
 sudo: false
-
 language: node_js
-
 node_js:
-  - 6
-  - 4
-  - 0.12
-
-cache:
-  directories:
-    - node_modules
-
-install:
-  - npm i -g npm@latest
-  - npm install
-
+  - stable
+  - '0.12'
+  - '0.10'
 after_script:
   - npm run coveralls
-
 branches:
   except:
     - /^v[0-9]/

README.md

@@ -1,5 +1,12 @@
 ## gulp-sourcemaps  [![NPM version][npm-image]][npm-url] [![build status][travis-image]][travis-url] [![Test coverage][coveralls-image]][coveralls-url]
 
+### Branching
+
+- master: is latest currently (2.X) - node > 4.X
+- 1.X: is node 0.X - only issues appear to be es6
+
+Preferably, we would like move on from node 0.X as much as possible as some of the dependencies are doing so as well. Meaning for features please target master for PRs. If bugs are found to be relvant to both 1.X and master then please target PRs for the 1.X branch to make git merging easier.
+
 ### Usage
 
 #### Write inline source maps
@@ -264,7 +271,7 @@ gulp.src(['src/test.js', 'src/testdir/test2.js'], { base: 'src' })
       .pipe(sourcemaps.write('../maps', {
         mapFile: function(mapFilePath) {
           // source map files are named *.map instead of *.js.map
-          return mapFile.replace('.js.map', '.map');
+          return mapFilePath.replace('.js.map', '.map');
         }
       }))
       .pipe(gulp.dest('public/scripts'));

src/write.js

@@ -148,36 +148,28 @@ function write(destPath, options) {
         }
       }
 
-      // add new source map file to stream
-      var sourceMapFile = new File({
-        cwd: file.cwd,
-        base: file.base,
-        path: sourceMapPath,
-        contents: new Buffer(JSON.stringify(sourceMap)),
-        stat: {
-          isFile: function() {
-            return true;
-          },
-          isDirectory: function() {
-            return false;
-          },
-          isBlockDevice: function() {
-            return false;
-          },
-          isCharacterDevice: function() {
-            return false;
-          },
-          isSymbolicLink: function() {
-            return false;
-          },
-          isFIFO: function() {
-            return false;
-          },
-          isSocket: function() {
-            return false;
-          }
-        }
-      });
+      var sourceMapFile;
+      if (options.clone !== undefined) {
+        // add new source map file to stream, clone from original to keep file.history
+        sourceMapFile = file.clone(options.clone);
+      } else {
+        // add new source map file to stream
+        sourceMapFile = new File({
+          cwd: file.cwd,
+          base: file.base
+        });
+      }
+      sourceMapFile.path = sourceMapPath;
+      sourceMapFile.contents = new Buffer(JSON.stringify(sourceMap));
+      sourceMapFile.stat = {
+        isFile: function () { return true; },
+        isDirectory: function () { return false; },
+        isBlockDevice: function () { return false; },
+        isCharacterDevice: function () { return false; },
+        isSymbolicLink: function () { return false; },
+        isFIFO: function () { return false; },
+        isSocket: function () { return false; }
+      };
       this.push(sourceMapFile);
 
       var sourceMapPathRelative = path.relative(path.dirname(file.path), sourceMapPath);