From 27ee2dacd4db08683620935517424fe6b40297b9 Mon Sep 17 00:00:00 2001 From: Matt Jeanes Date: Mon, 18 Jun 2018 13:01:29 +0100 Subject: [PATCH] Missed a tiny bit --- src/Ombi/Properties/launchSettings.json | 2 +- src/Ombi/Startup.cs | 6 +++++- src/Ombi/webpack.dev.js | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 src/Ombi/webpack.dev.js diff --git a/src/Ombi/Properties/launchSettings.json b/src/Ombi/Properties/launchSettings.json index 6f8700cc2..33794436c 100644 --- a/src/Ombi/Properties/launchSettings.json +++ b/src/Ombi/Properties/launchSettings.json @@ -13,7 +13,7 @@ "commandLineArgs": "-baseurl /testing", "launchBrowser": true, "environmentVariables": { - //"ASPNETCORE_ENVIRONMENT": "Development" + "ASPNETCORE_ENVIRONMENT": "Development" } }, "Ombi": { diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs index 8037a3021..b2255be9b 100644 --- a/src/Ombi/Startup.cs +++ b/src/Ombi/Startup.cs @@ -160,7 +160,11 @@ namespace Ombi app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions { HotModuleReplacement = true, - ConfigFile = "webpack.dev.js" + ConfigFile = "webpack.config.ts", + EnvParam = new + { + aot = false // can't use AOT with HMR currently https://github.com/angular/angular-cli/issues/6347 + } }); } diff --git a/src/Ombi/webpack.dev.js b/src/Ombi/webpack.dev.js deleted file mode 100644 index 04e36fc16..000000000 --- a/src/Ombi/webpack.dev.js +++ /dev/null @@ -1,4 +0,0 @@ -// https://github.com/aspnet/JavaScriptServices/issues/1046 - -require('ts-node/register') -module.exports = require("./webpack.config.ts"); \ No newline at end of file