fix(dev-server): fix historyApiFallback disableDotRule

Closes #1108

Author: adamdbradley

src/declarations/config.ts

@@ -298,7 +298,7 @@ export interface ConfigBundle {
 
 
 export interface ServiceWorkerConfig {
-  // https://workboxjs.org/reference-docs/latest/module-workbox-build.html#.Configuration
+  // https://developers.google.com/web/tools/workbox/modules/workbox-build#full_generatesw_config
   swDest?: string;
   swSrc?: string;
   globPatterns?: string[];

src/dev-server/request-handler.ts

@@ -22,7 +22,7 @@ export function createRequestHandler(devServerConfig: d.DevServerConfig, fs: d.F
         return res.end();
       }
 
-      if (!req.url.startsWith(devServerConfig.baseUrl)) {
+      if (!req.pathname.startsWith(devServerConfig.baseUrl)) {
         return serve404Content(res, `404 File Not Found, base url: ${devServerConfig.baseUrl}`);
       }
 
@@ -92,9 +92,18 @@ function normalizeHttpRequest(devServerConfig: d.DevServerConfig, incomingReq: h
 }
 
 
-function isValidHistoryApi(devServerConfig: d.DevServerConfig, req: d.HttpRequest) {
-  return !!devServerConfig.historyApiFallback &&
-         req.method === 'GET' &&
-         (!devServerConfig.historyApiFallback.disableDotRule && !req.pathname.includes('.')) &&
-         req.acceptHeader.includes('text/html');
+export function isValidHistoryApi(devServerConfig: d.DevServerConfig, req: d.HttpRequest) {
+  if (!devServerConfig.historyApiFallback) {
+    return false;
+  }
+  if (req.method !== 'GET') {
+    return false;
+  }
+  if (!req.acceptHeader.includes('text/html') && req.acceptHeader !== '*/*') {
+    return false;
+  }
+  if (!devServerConfig.historyApiFallback.disableDotRule && req.pathname.includes('.')) {
+    return false;
+  }
+  return true;
 }

src/dev-server/test/req-handler.spec.ts

@@ -74,11 +74,11 @@ describe('request-handler', async () => {
       req.headers = {
         accept: '*/*'
       };
-      req.url = '/about.us';
+      req.url = 'http://stenciljs.com/about.us';
       req.method = 'GET';
 
       await handler(req, res);
-      expect(res.$statusCode).toBe(404);
+      expect(res.$statusCode).toBe(200);
     });
 
     it('should not load historyApiFallback index.html when dot in the url', async () => {
@@ -91,7 +91,7 @@ describe('request-handler', async () => {
       req.headers = {
         accept: '*/*'
       };
-      req.url = '/about.us';
+      req.url = 'http://stenciljs.com/about.us';
       req.method = 'GET';
 
       await handler(req, res);
@@ -380,17 +380,6 @@ describe('request-handler', async () => {
 });
 
 
-function readResponse(res: http.ServerRequest) {
-  let content = '';
-
-  res.on('data', chunk => {
-    content += chunk;
-  });
-
-  return content;
-}
-
-
 interface TestServerResponse extends http.ServerResponse {
   $statusCode: number;
   $headers: any;

test/karma/stencil.config.ts

@@ -28,5 +28,11 @@ export const config: Config = {
     builtins(),
     globals(),
     sass()
-  ]
+  ],
+  devServer: {
+    historyApiFallback: {
+      disableDotRule: true,
+      index: 'index.html'
+    }
+  }
 };

test/karma/test-app/index.html

@@ -0,0 +1 @@
+index