From 067c63c4500bc5bd16741c50e7780333fec95ccc Mon Sep 17 00:00:00 2001
From: Filipe Silva <filipematossilva@gmail.com>
Date: Mon, 17 Oct 2016 12:32:37 +0100
Subject: [PATCH] fix(serve): enable routes with dots (#2535)

Fix #2168
---
 package.json                                | 2 +-
 packages/angular-cli/custom-typings.d.ts    | 2 +-
 packages/angular-cli/package.json           | 2 +-
 packages/angular-cli/tasks/serve-webpack.ts | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 8341787c4a51..fef1abb32fe0 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "typescript": "2.0.2",
     "url-loader": "^0.5.7",
     "webpack": "2.1.0-beta.25",
-    "webpack-dev-server": "2.1.0-beta.3",
+    "webpack-dev-server": "2.1.0-beta.9",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
     "zone.js": "^0.6.23"
diff --git a/packages/angular-cli/custom-typings.d.ts b/packages/angular-cli/custom-typings.d.ts
index 1fbb264de74a..5f17ab354124 100644
--- a/packages/angular-cli/custom-typings.d.ts
+++ b/packages/angular-cli/custom-typings.d.ts
@@ -1,7 +1,7 @@
 interface IWebpackDevServerConfigurationOptions {
   contentBase?: string;
   hot?: boolean;
-  historyApiFallback?: boolean;
+  historyApiFallback?: {[key: string]: boolean} | boolean;
   compress?: boolean;
   proxy?: {[key: string]: string};
   staticOptions?: any;
diff --git a/packages/angular-cli/package.json b/packages/angular-cli/package.json
index ac2c22156d16..962a118f074d 100644
--- a/packages/angular-cli/package.json
+++ b/packages/angular-cli/package.json
@@ -92,7 +92,7 @@
     "typescript": "2.0.2",
     "url-loader": "^0.5.7",
     "webpack": "2.1.0-beta.25",
-    "webpack-dev-server": "2.1.0-beta.3",
+    "webpack-dev-server": "2.1.0-beta.9",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
     "zone.js": "^0.6.23"
diff --git a/packages/angular-cli/tasks/serve-webpack.ts b/packages/angular-cli/tasks/serve-webpack.ts
index 42d16c9c4712..7e4572f4082b 100644
--- a/packages/angular-cli/tasks/serve-webpack.ts
+++ b/packages/angular-cli/tasks/serve-webpack.ts
@@ -57,7 +57,9 @@ export default Task.extend({
         this.project.root,
         `./${CliConfig.fromProject().config.apps[0].root}`
       ),
-      historyApiFallback: true,
+      historyApiFallback: {
+        disableDotRule: true,
+      },
       stats: webpackDevServerOutputOptions,
       inline: true,
       proxy: proxyConfig,