Merge pull request ben-ng#13 from aMarCruz/master

Support charset in inlined sourcemap

Author: stefanpenner

index.js

@@ -59,7 +59,7 @@ validate = function (min, map, srcs) {
   // If no map was given, try to extract it from min
   if(map == null) {
     try {
-      var re = /\s*\/\/(?:@|#) sourceMappingURL=data:application\/json;base64,(\S*)$/m
+      var re = /\s*\/\/(?:@|#) sourceMappingURL=data:application\/json;(?:charset=utf-?8;)?base64,(\S*)$/m
         , map = min.match(re);
 
       map = createBuffer(map[1], 'base64').toString();

tests/unit.js

@@ -92,6 +92,26 @@ tests['Valid Minifyified bundle with inline sourcemap should not throw'] = funct
   }, 'Valid Minifyified inline sourcemap and inline sourceContent should not throw');
 };
 
+tests['Valid Minifyified bundle with inline sourcemap and charset should not throw'] = function () {
+  var mfDir = path.join(validDir, 'Minifyified')
+    , min = fs.readFileSync(path.join(mfDir, 'bundle.min.js')).toString()
+      .replace('/json;base64,', '/json;charset=utf-8;base64,');
+
+  assert.doesNotThrow(function () {
+    validate(min);
+  }, 'Valid Minifyified inline sourcemap and inline sourceContent should not throw');
+};
+
+tests['Valid Minifyified bundle with charset without hyphen should not throw'] = function () {
+  var mfDir = path.join(validDir, 'Minifyified')
+    , min = fs.readFileSync(path.join(mfDir, 'bundle.min.js')).toString()
+      .replace('/json;base64,', '/json;charset=utf8;base64,');
+
+  assert.doesNotThrow(function () {
+    validate(min);
+  }, 'Valid Minifyified inline sourcemap and inline sourceContent should not throw');
+};
+
 tests['Valid Babel map should not throw'] = function () {
   var babelDir = path.join(validDir, 'Babel')
     , map = fs.readFileSync(path.join(babelDir, 'router.js.map')).toString();