Avoid replacing filenames contained in longer filenames

index.js

@@ -2,6 +2,7 @@
 
 module.exports = plugin;
 
+var escapeRegExp = require('lodash.escaperegexp');
 var path = require('path');
 var PluginError = require('plugin-error');
 var through = require('through2');
@@ -78,10 +79,26 @@ function plugin(options) {
       cache.forEach(function replaceInFile(file) {
         var contents = file.contents.toString();
 
-        renames.forEach(function replaceOnce(rename) {
+        renames.forEach(function replaceOnce(rename, index) {
           var unreved = options.modifyUnreved ? options.modifyUnreved(rename.unreved) : rename.unreved;
           var reved = options.modifyReved ? options.modifyReved(rename.reved) : rename.reved;
-          contents = contents.split(unreved).join(reved);
+          var regexp = new RegExp(escapeRegExp(unreved), 'g');
+          var containingUnreved = [];
+          for (var i = 0; i < index; i+=1){
+            var longerUnreved = options.modifyUnreved ? options.modifyUnreved(renames[i].unreved) : renames[i].unreved;
+            if(longerUnreved.indexOf(unreved) !== -1){
+              containingUnreved.push(longerUnreved);
+            }
+          }
+          contents = contents.replace(regexp, function(match, offset, string){
+            for(var i = 0; i < containingUnreved.length; i+=1){
+              var element = containingUnreved[i];
+              if (string.substr(offset, element.length) === element || string.substr(offset + match.length - element.length, element.length) === element) {
+                return match;
+              }
+            }
+            return reved;
+          })
           if (options.prefix) {
             contents = contents.split('/' + options.prefix).join(options.prefix + '/');
           }

package.json

@@ -25,6 +25,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "lodash.escaperegexp": "^4.1.2",
     "plugin-error": "^0.1.2",
     "through2": "^2.0.0"
   },

test.js

@@ -117,6 +117,40 @@ it('should not replace filenames in extensions not in replaceInExtensions', func
   filesToRevFilter.end();
 });
 
+it('should not replace filenames contained in longer filenames', function(cb) {
+  var css = '@font-face { src:url(\'font.woff2\'), url(\'font.woff\'), url(\'myfont.woff\'); }';
+
+  var manifest = es.readArray([
+    new Vinyl({
+      path: 'rev-manifest.json',
+      contents: new Buffer(JSON.stringify({
+        'font.woff': 'font.woff?v=f56bc5932b',
+        'font.woff2': 'font.woff2?v=c6d1b13464',
+        'myfont.woff': 'myfont.woff?v=d98ag4566d'
+      }))
+    })
+  ]);
+
+  var stream = revReplace({ manifest: manifest });
+
+  stream.on('data', function(file) {
+    var content = file.contents.toString();
+
+    assert.equal(content, "@font-face { src:url('font.woff2?v=c6d1b13464'), url('font.woff?v=f56bc5932b'), url('myfont.woff?v=d98ag4566d'); }");
+  });
+
+  stream.on('end', function() {
+    cb();
+  });
+
+  stream.write(new Vinyl({
+    path: 'index.css',
+    contents: new Buffer(css)
+  }));
+
+  stream.end();
+});
+
 it('should not canonicalize URIs when option is off', function (cb) {
   var filesToRevFilter = filter(['**/*.css'], {restore: true});