yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10503 from umbraco/v9/task/smidge-update

Browse Source 
Updates to latest smidge and changes how debug assets work
This commit is contained in:
Shannon Deminick
2021-06-22 06:22:03 +10:00
committed by GitHub
parent ff99e6c6fd a0cc6d904c
commit 8cf8fb43a4
5 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Umbraco.Cms.Infrastructure.Examine</RootNamespace>
@@ -25,7 +25,7 @@
<ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Examine" Version="2.0.0-beta.150" />
<PackageReference Include="Examine" Version="2.0.0-beta.154" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

2
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -49,7 +49,7 @@
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="5.0.0" />
<PackageReference Include="Examine.Core" Version="2.0.0-beta.136" />
<PackageReference Include="Examine.Core" Version="2.0.0-beta.154" />
<PackageReference Include="Umbraco.Code" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>

2
src/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj
View File

@@ -66,7 +66,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.150" />
<PackageReference Include="Examine.Lucene" Version="2.0.0-beta.154" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />

8
src/Umbraco.Web.Common/RuntimeMinification/SmidgeRuntimeMinifier.cs
View File

@@ -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");
}

5
src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
View File

@@ -35,9 +35,8 @@
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.3" />
<PackageReference Include="Smidge" Version="4.0.0-beta.274" />
<PackageReference Include="Smidge.Nuglify" Version="4.0.0-beta.274" />
<PackageReference Include="Smidge.InMemory" Version="4.0.0-beta.274" />
<PackageReference Include="Smidge.Nuglify" Version="4.0.0-beta.352" />
<PackageReference Include="Smidge.InMemory" Version="4.0.0-beta.352" />
<PackageReference Include="Dazinator.Extensions.FileProviders" Version="2.0.0" />
<PackageReference Include="Umbraco.Code" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>