From dcfdbc8f046ac7d3a984e63c951a37ea0a150351 Mon Sep 17 00:00:00 2001
From: SteveSandersonMS <stevesa@microsoft.com>
Date: Thu, 31 Mar 2016 15:53:11 +0100
Subject: [PATCH] Simplify aspnet-webpack - remove 'express' dependency and use
 'connect' directly instead

---
 .../npm/aspnet-webpack/package.json                |  6 +++---
 .../npm/aspnet-webpack/src/WebpackDevMiddleware.ts |  4 ++--
 .../npm/aspnet-webpack/tsd.json                    | 14 ++++----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json
index 742de48..49fbc4e 100644
--- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json
+++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/package.json
@@ -1,17 +1,17 @@
 {
   "name": "aspnet-webpack",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Helpers for using Webpack in ASP.NET projects. Works in conjunction with the Microsoft.AspNet.SpaServices NuGet package.",
   "main": "index.js",
   "scripts": {
-    "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack\"'",
+    "prepublish": "rm *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack\"'",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "Microsoft",
   "license": "Apache-2.0",
   "dependencies": {
     "es6-promise": "^3.1.2",
-    "express": "^4.13.4",
+    "connect": "^3.4.1",
     "memory-fs": "^0.3.0",
     "require-from-string": "^1.1.0",
     "webpack": "^1.12.14",
diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
index d15d861..10c78bd 100644
--- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
+++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import * as connect from 'connect';
 import * as webpack from 'webpack';
 import { requireNewCopy } from './RequireNewCopy';
 
@@ -34,7 +34,7 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
         return;
     }
 
-    const app = express();
+    const app = connect();
     const defaultPort = 0; // 0 means 'choose randomly'. Could allow an explicit value to be supplied instead.
     const listener = app.listen(defaultPort, () => {
         // Build the final Webpack config based on supplied options
diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/tsd.json b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/tsd.json
index 6644545..5045ee7 100644
--- a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/tsd.json
+++ b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/tsd.json
@@ -5,20 +5,11 @@
   "path": "typings",
   "bundle": "typings/tsd.d.ts",
   "installed": {
-    "express/express.d.ts": {
-      "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
-    },
     "webpack/webpack.d.ts": {
       "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
     },
     "node/node.d.ts": {
-      "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
-    },
-    "serve-static/serve-static.d.ts": {
-      "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
-    },
-    "mime/mime.d.ts": {
-      "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
+      "commit": "e937b3e64af586d19f2ea29fdf771e9dc4feecc8"
     },
     "source-map/source-map.d.ts": {
       "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
@@ -28,6 +19,9 @@
     },
     "es6-promise/es6-promise.d.ts": {
       "commit": "0144ad5a74053f2292424847259c4c8e1d0fecaa"
+    },
+    "connect/connect.d.ts": {
+      "commit": "e937b3e64af586d19f2ea29fdf771e9dc4feecc8"
     }
   }
 }