Merge branch 'master' into patch-1

joscha · Apr 13, 2017 · 609c21f · 609c21f
2 parents a0dbb17 + d0efb70
commit 609c21f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/dist/server/middleware.js b/dist/server/middleware.js
@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
 exports.default = function (configDir) {
   // Build the webpack configuration using the `getBaseConfig`
   // custom `.babelrc` file and `webpack.config.js` files
@@ -17,11 +21,11 @@ exports.default = function (configDir) {
   }
 
   var compiler = (0, _webpack2.default)(config);
-  var devMiddlewareOptions = {
+  var devMiddlewareOptions = (0, _extends3.default)({
     noInfo: true,
     publicPath: config.output.publicPath,
     watchOptions: config.watchOptions || {}
-  };
+  }, config.devServer);
 
   var router = new _express.Router();
   router.use((0, _webpackDevMiddleware2.default)(compiler, devMiddlewareOptions));

diff --git a/src/server/index.html.js b/src/server/index.html.js
@@ -39,6 +39,7 @@ export default function (data) {
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="storybook-version" content="${version}">
+        <meta content="IE=edge" http-equiv="X-UA-Compatible" />
         <title>React Storybook</title>
         <style>
           /*

diff --git a/src/server/middleware.js b/src/server/middleware.js
@@ -25,6 +25,7 @@ export default function (configDir) {
     noInfo: true,
     publicPath: config.output.publicPath,
     watchOptions: config.watchOptions || {},
+    ...config.devServer,
   };
 
   const router = new Router();