Merge pull request aspnet#57 from laskoviymishka/unshift-issue

SteveSandersonMS · SteveSandersonMS · commit e315bd2c28b7 · 2016-05-02T10:54:54.000-07:00
Fix issue: entry.main.unshift is not a function Closes aspnet#56
diff --git a/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNet.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
@@ -40,7 +40,11 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option
         // Build the final Webpack config based on supplied options
         if (enableHotModuleReplacement) {
             // TODO: Stop assuming there's an entry point called 'main'
-            webpackConfig.entry['main'].unshift('webpack-hot-middleware/client');
+            if (typeof webpackConfig.entry['main'] === 'string') {
+              webpackConfig.entry['main'] = ['webpack-hot-middleware/client', webpackConfig.entry['main']];
+            } else {
+              webpackConfig.entry['main'].unshift('webpack-hot-middleware/client');
+            }
             webpackConfig.plugins.push(
                 new webpack.HotModuleReplacementPlugin()
             );
