Skip to content

Commit e192bba

Browse files
callumacraeSpaceK33z
authored andcommitted
Added charset=UTF-8 to content-type to fix encoding issues. (webpack#136)
See webpack/webpack-dev-server#432 for bug report.
1 parent aaabf15 commit e192bba

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

middleware.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ module.exports = function(compiler, options) {
240240
var content = fs.readFileSync(filename);
241241
content = handleRangeHeaders(content, req, res);
242242
res.setHeader("Access-Control-Allow-Origin", "*"); // To support XHR, etc.
243-
res.setHeader("Content-Type", mime.lookup(filename));
243+
res.setHeader("Content-Type", mime.lookup(filename) + "; charset=UTF-8");
244244
res.setHeader("Content-Length", content.length);
245245
if(options.headers) {
246246
for(var name in options.headers) {

test/Server.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe("Server", function() {
4444

4545
it("GET request to bundle file", function(done) {
4646
request(app).get("/public/bundle.js")
47-
.expect("Content-Type", "application/javascript")
47+
.expect("Content-Type", "application/javascript; charset=UTF-8")
4848
.expect("Content-Length", "2780")
4949
.expect("Access-Control-Allow-Origin", "*")
5050
.expect(200, /console\.log\("Hey\."\)/, done);
@@ -57,7 +57,7 @@ describe("Server", function() {
5757

5858
it("request to image", function(done) {
5959
request(app).get("/public/svg.svg")
60-
.expect("Content-Type", "image/svg+xml")
60+
.expect("Content-Type", "image/svg+xml; charset=UTF-8")
6161
.expect("Content-Length", "4778")
6262
.expect("Access-Control-Allow-Origin", "*")
6363
.expect(200, done);
@@ -71,13 +71,13 @@ describe("Server", function() {
7171

7272
it("request to HMR json", function(done) {
7373
request(app).get("/public/123a123412.hot-update.json")
74-
.expect("Content-Type", "application/json")
74+
.expect("Content-Type", "application/json; charset=UTF-8")
7575
.expect(200, /\[\"hi\"\]/, done);
7676
});
7777

7878
it("request to directory", function(done) {
7979
request(app).get("/public/")
80-
.expect("Content-Type", "text/html")
80+
.expect("Content-Type", "text/html; charset=UTF-8")
8181
.expect("Content-Length", "10")
8282
.expect("Access-Control-Allow-Origin", "*")
8383
.expect(200, /My\ Index\./, done);

0 commit comments

Comments
 (0)