Merge pull request webpack#7334 from gatimus/bugfix/json-byteordermark

sokra · web-flow · commit 830e6d2c68cb · 2018-05-19T13:22:14.000+02:00
fix: json with byte order mark
diff --git a/lib/JsonParser.js b/lib/JsonParser.js
@@ -13,7 +13,7 @@ class JsonParser {
 	}
 
 	parse(source, state) {
-		const data = parseJson(source);
+		const data = parseJson(source[0] === "\ufeff" ? source.slice(1) : source);
 		state.module.buildInfo.jsonData = data;
 		state.module.buildMeta.exportsType = "named";
 		if (typeof data === "object" && data)
diff --git a/test/cases/parsing/bom/bomfile.json b/test/cases/parsing/bom/bomfile.json
@@ -0,0 +1 @@
+﻿{ "message": "ok" }
diff --git a/test/cases/parsing/bom/index.js b/test/cases/parsing/bom/index.js
@@ -7,3 +7,8 @@ it("should load a css file with BOM", function() {
 	var css = require("!css-loader!./bomfile.css") + "";
 	expect(css).toBe("body{color:#abc}");
 });
+
+it("should load a json file with BOM", function() {
+	var result = require("./bomfile.json");
+	expect(result.message).toEqual("ok");
+});

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class JsonParser {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`parse(source, state) {`
`16`		`- const data = parseJson(source);`
	`16`	`+ const data = parseJson(source[0] === "\ufeff" ? source.slice(1) : source);`
`17`	`17`	`state.module.buildInfo.jsonData = data;`
`18`	`18`	`state.module.buildMeta.exportsType = "named";`
`19`	`19`	`if (typeof data === "object" && data)`