fix(serve): enable routes with dots (#2535)

Fix #2168
angular · Oct 19, 2016 · 067c63c · 067c63c
1 parent 31f61d0
commit 067c63c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,