From d818d3bc3665801e9df7298766449a8061c540d9 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 21 Jun 2021 13:51:57 -0600 Subject: [PATCH 1/2] Updates to latest smidge and changes how debug assets work --- .../RuntimeMinification/SmidgeRuntimeMinifier.cs | 8 ++------ src/Umbraco.Web.Common/Umbraco.Web.Common.csproj | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs index 656825eb4c..4353b2ee1a 100644 --- a/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs +++ b/src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs @@ -98,8 +98,6 @@ namespace Umbraco.Cms.Web.Common.RuntimeMinification .ForDebug(builder => builder // auto-invalidate bundle if files change in debug .EnableFileWatcher() - // keep using composite files in debug, not raw static files - .EnableCompositeProcessing() // use the cache buster defined in config .SetCacheBusterType(_cacheBusterType)) .ForProduction(builder => builder @@ -144,8 +142,6 @@ namespace Umbraco.Cms.Web.Common.RuntimeMinification .ForDebug(builder => builder // auto-invalidate bundle if files change in debug .EnableFileWatcher() - // keep using composite files in debug, not raw static files - .EnableCompositeProcessing() // use the cache buster defined in config .SetCacheBusterType(_cacheBusterType)) .ForProduction(builder => builder @@ -182,10 +178,10 @@ namespace Umbraco.Cms.Web.Common.RuntimeMinification case AssetType.Javascript: return await _jsMinPipeline.Value .ProcessAsync( - new FileProcessContext(fileContent, new JavaScriptFile(), BundleContext.CreateEmpty())); + new FileProcessContext(fileContent, new JavaScriptFile(), BundleContext.CreateEmpty(CacheBuster))); case AssetType.Css: return await _cssMinPipeline.Value - .ProcessAsync(new FileProcessContext(fileContent, new CssFile(), BundleContext.CreateEmpty())); + .ProcessAsync(new FileProcessContext(fileContent, new CssFile(), BundleContext.CreateEmpty(CacheBuster))); default: throw new NotSupportedException("Unexpected AssetType"); } diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 2da18ce77b..1b31ddca65 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -35,9 +35,8 @@ - - - + + all From a0cc6d904c6e4cfe600a946a5f0694b629c41418 Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 21 Jun 2021 14:17:17 -0600 Subject: [PATCH 2/2] Updates to latest Examine on nuget --- src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj | 4 ++-- src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj | 2 +- .../Umbraco.Tests.Integration.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index fdd8ba9d64..5dd6d9bde6 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 Umbraco.Cms.Infrastructure.Examine @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index d6ac151277..57166ee7e3 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -49,7 +49,7 @@ - + all diff --git a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index 6198cb91c2..7c7ba3389f 100644 --- a/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -66,7 +66,7 @@ - +