fix(middleware): switch headers and mime types handling back after fi…

…le check (#672)

src/middleware.js

@@ -49,9 +49,12 @@ export default function wrapper(context) {
  return;
  }
 
- // Content-Type and headers need to be set before checking if
- // the file is in the outputFileSystem, as these things should be
- // applied to all files that are being served
+ try {
+ content = context.outputFileSystem.readFileSync(filename);
+ } catch (_ignoreError) {
+ await goNext();
+ return;
+ }
 
  if (!res.get('Content-Type')) {
  // content-type name(like application/javascript; charset=utf-8) or false
@@ -68,13 +71,6 @@ export default function wrapper(context) {
  }
  }
 
- try {
- content = context.outputFileSystem.readFileSync(filename);
- } catch (_ignoreError) {
- await goNext();
- return;
- }
-
  // Buffer
  content = handleRangeHeaders(content, req, res);
 

test/middleware.test.js

@@ -2080,7 +2080,7 @@ describe('middleware', () => {
  });
  });
 
- describe('should set "Content-Type" header for route not from outputFileSystem', () => {
+ describe('should not set "Content-Type" header for route not from outputFileSystem', () => {
  beforeAll((done) => {
  const outputPath = path.resolve(__dirname, './outputs/basic');
  const compiler = getCompiler({
@@ -2109,10 +2109,10 @@ describe('middleware', () => {
 
  afterAll(close);
 
- it('should return the "200" code for the "GET" request "file.jpg"', (done) => {
+ it('should return the "200" code for the "GET" request "file.jpg" with default content type', (done) => {
  request(app)
  .get('/file.jpg')
- .expect('Content-Type', /application\/octet-stream/)
+ .expect('Content-Type', /text\/html/)
  .expect(200, done);
  });
  });
@@ -2741,15 +2741,15 @@ describe('middleware', () => {
  .expect(200, done);
  });
 
- it('should return the "200" code for the "GET" request to path not in outputFileSystem and return headers', (done) => {
+ it('should return the "200" code for the "GET" request to path not in outputFileSystem but not return headers', async () => {
  app.get('/file.jpg', (req, res) => {
  res.send('welcome');
  });
- request(app)
-  .get('/file.jpg')
-  .expect('X-nonsense-1', 'yes')
-  .expect('X-nonsense-2', 'no')
-  .expect(200, done);
+
+ const res = await request(app).get('/file.jpg');
+ expect(res.statusCode).toEqual(200);
+ expect(res.headers['X-nonsense-1']).toBeUndefined();
+ expect(res.headers['X-nonsense-2']).toBeUndefined();
  });
  });