From 779214f9d371baf2963c6ff3204f15ebe21e934b Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 16 Oct 2020 15:23:02 +1100 Subject: [PATCH] preserve function names and update smidge --- .../Configuration/Models/ModelsBuilderSettings.cs | 1 + src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs | 1 + src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs b/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs index 414165d2e4..9667a5eb2d 100644 --- a/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs +++ b/src/Umbraco.Core/Configuration/Models/ModelsBuilderSettings.cs @@ -7,6 +7,7 @@ namespace Umbraco.Core.Configuration.Models /// public class ModelsBuilderSettings { + // TODO: This should not go into App_Data - that folder isn't really a real thing anymore public static string DefaultModelsDirectory => "~/App_Data/Models"; /// diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs index e11923095a..bab4abde53 100644 --- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs +++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeNuglifyJs.cs @@ -20,6 +20,7 @@ namespace Umbraco.Web.Common.RuntimeMinification // angular injection to handle minification correctly which requires declaring string named versions of all // dependencies injected (which is a pain). So we just turn this option off. nuglifyCodeSettings.LocalRenaming = NUglify.JavaScript.LocalRenaming.KeepAll; + nuglifyCodeSettings.PreserveFunctionNames = true; return new NuglifySettings(new NuglifyCodeSettings(nuglifyCodeSettings), defaultSettings.CssCodeSettings); } diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index f4a763c9c7..a712a43a45 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -26,8 +26,8 @@ - - + +