From 08c2f231ea5648b2fd24eb5c1cb74827efd96239 Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Wed, 24 Jan 2018 17:49:51 -0800 Subject: [PATCH] Bump aspnet-webpack version to 2.0.2. Also, further minor tweak to TypeScript annotations. --- .../npm/aspnet-webpack/package.json | 2 +- .../npm/aspnet-webpack/src/WebpackDevMiddleware.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json index d11bb98..b48bb68 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json @@ -1,6 +1,6 @@ { "name": "aspnet-webpack", - "version": "2.0.1", + "version": "2.0.2", "description": "Helpers for using Webpack in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.", "main": "index.js", "scripts": { diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts index bc8c21a..502ecaa 100644 --- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts +++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts @@ -262,9 +262,9 @@ export function createWebpackDevServer(callback: CreateDevServerCallback, option webpackConfigExport = webpackConfigExport(options.suppliedOptions.EnvParam); } - const webpackConfigThenable: Thenable = isThenable(webpackConfigExport) + const webpackConfigThenable = isThenable(webpackConfigExport) ? webpackConfigExport - : { then: callback => callback(webpackConfigExport) }; + : { then: callback => callback(webpackConfigExport) } as Thenable; webpackConfigThenable.then(webpackConfigResolved => { const webpackConfigArray = webpackConfigResolved instanceof Array ? webpackConfigResolved : [webpackConfigResolved];