Merge pull request webpack#2340 from jaredleechn/webpack-1

sokra · sokra · commit 326c8175af55 · 2016-04-15T15:19:11.000+02:00
[fix] set charset as 'utf-8' in sourcemap plugin in branch webpack-1,…
diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js
@@ -57,7 +57,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla
 		}
 		sourceMap.sourceRoot = "";
 		sourceMap.file = module.id + ".js";
-		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
+		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
 		source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");
 		return source.__EvalSourceMapDevToolData;
 	});
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -152,7 +152,7 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
 							return JSON.stringify(sourceMap);
 						})
 						.replace(/\[url\]/g, function() {
-							return "data:application/json;base64," +
+							return "data:application/json;charset=utf-8;base64," +
 								new Buffer(JSON.stringify(sourceMap)).toString("base64");
 						})
 					);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla`
`57`	`57`	`}`
`58`	`58`	`sourceMap.sourceRoot = "";`
`59`	`59`	`sourceMap.file = module.id + ".js";`
`60`		`- var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));`
	`60`	`+ var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));`
`61`	`61`	`source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");`
`62`	`62`	`return source.__EvalSourceMapDevToolData;`
`63`	`63`	`});`