From ffee0e6ad40c0a9b8ebd6024f4a08f9089c1ddaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Sun, 17 Nov 2024 13:06:50 +0100 Subject: [PATCH] fix(ScopedCss): Render without PlainHtml --- paket.dependencies | 4 +- paket.lock | 166 ++++++++++++++++---------------- src/Bolero.Templating/Client.fs | 2 +- 3 files changed, 85 insertions(+), 87 deletions(-) diff --git a/paket.dependencies b/paket.dependencies index 93001c7..fe9742b 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -7,8 +7,8 @@ strategy: min # Project references nuget FSharp.Core >= 6.0 -nuget Bolero >= 0.22.43 -nuget Bolero.Server >= 0.22.43 +nuget Bolero >= 0.23.52 +nuget Bolero.Server >= 0.23.52 nuget Microsoft.AspNetCore.Components.WebAssembly.Server >= 6.0 nuget Microsoft.AspNetCore.SignalR.Client >= 6.0 nuget HtmlAgilityPack >= 1.11.39 diff --git a/paket.lock b/paket.lock index 95c5c9b..e9bcc6d 100644 --- a/paket.lock +++ b/paket.lock @@ -4,15 +4,17 @@ LOWEST_MATCHING: TRUE RESTRICTION: || (== net6.0) (== net7.0) NUGET remote: https://api.nuget.org/v3/index.json - Bolero (0.22.43) + Bolero (0.23.52) Elmish (>= 4.0.1 < 5.0) FSharp.Core (>= 6.0) FSharp.SystemTextJson (>= 0.19.13) - Microsoft.AspNetCore.Components.WebAssembly (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) Microsoft.AspNetCore.Components.WebAssembly (>= 6.0 < 7.0) - restriction: == net6.0 + Microsoft.AspNetCore.Components.WebAssembly (>= 7.0 < 8.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) Microsoft.Extensions.Http (>= 6.0) - Bolero.Server (0.22.43) - Bolero (0.22.43) + Microsoft.JSInterop.WebAssembly (>= 6.0 < 7.0) - restriction: == net6.0 + Microsoft.JSInterop.WebAssembly (>= 7.0 < 8.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Bolero.Server (0.23.52) + Bolero (0.23.52) FSharp.Core (>= 6.0) FSharp.SystemTextJson (>= 0.19.13) Elmish (4.0.1) @@ -21,28 +23,28 @@ NUGET FSharp.Core (>= 4.7) System.Text.Json (>= 6.0) HtmlAgilityPack (1.11.39) - Microsoft.AspNetCore.Authorization (6.0) - restriction: == net6.0 - Microsoft.AspNetCore.Metadata (>= 6.0) - Microsoft.Extensions.Logging.Abstractions (>= 6.0) - Microsoft.Extensions.Options (>= 6.0) - Microsoft.AspNetCore.Components (6.0) - restriction: == net6.0 - Microsoft.AspNetCore.Authorization (>= 6.0) - Microsoft.AspNetCore.Components.Analyzers (>= 6.0) - Microsoft.AspNetCore.Components.Analyzers (6.0) - restriction: == net6.0 - Microsoft.AspNetCore.Components.Forms (6.0) - restriction: == net6.0 - Microsoft.AspNetCore.Components (>= 6.0) - Microsoft.AspNetCore.Components.Web (6.0) - restriction: == net6.0 - Microsoft.AspNetCore.Components (>= 6.0) - Microsoft.AspNetCore.Components.Forms (>= 6.0) - Microsoft.Extensions.DependencyInjection (>= 6.0) - Microsoft.JSInterop (>= 6.0) - System.IO.Pipelines (>= 6.0) - Microsoft.AspNetCore.Components.WebAssembly (6.0) - restriction: == net6.0 - Microsoft.AspNetCore.Components.Web (>= 6.0) - Microsoft.Extensions.Configuration.Binder (>= 6.0) - Microsoft.Extensions.Configuration.Json (>= 6.0) - Microsoft.Extensions.Logging (>= 6.0) - Microsoft.JSInterop.WebAssembly (>= 6.0) + Microsoft.AspNetCore.Authorization (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Metadata (>= 7.0) + Microsoft.Extensions.Logging.Abstractions (>= 7.0) + Microsoft.Extensions.Options (>= 7.0) + Microsoft.AspNetCore.Components (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Authorization (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.Analyzers (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.Analyzers (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.Forms (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.Web (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.Forms (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.DependencyInjection (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.JSInterop (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + System.IO.Pipelines (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.WebAssembly (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.AspNetCore.Components.Web (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Configuration.Binder (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Configuration.Json (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Logging (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.JSInterop.WebAssembly (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) Microsoft.AspNetCore.Components.WebAssembly.Server (6.0) Microsoft.AspNetCore.Connections.Abstractions (6.0) Microsoft.Extensions.Features (>= 6.0) @@ -53,7 +55,7 @@ NUGET Microsoft.Extensions.Options (>= 6.0) Microsoft.AspNetCore.Http.Connections.Common (6.0) Microsoft.AspNetCore.Connections.Abstractions (>= 6.0) - Microsoft.AspNetCore.Metadata (6.0) - restriction: == net6.0 + Microsoft.AspNetCore.Metadata (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) Microsoft.AspNetCore.SignalR.Client (6.0) Microsoft.AspNetCore.Http.Connections.Client (>= 6.0) Microsoft.AspNetCore.SignalR.Client.Core (>= 6.0) @@ -68,70 +70,66 @@ NUGET Microsoft.Extensions.Options (>= 6.0) Microsoft.AspNetCore.SignalR.Protocols.Json (6.0) Microsoft.AspNetCore.SignalR.Common (>= 6.0) - Microsoft.Extensions.Configuration (6.0) - restriction: == net6.0 - Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.Configuration.Abstractions (6.0) - restriction: == net6.0 - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.Configuration.Binder (6.0) - restriction: == net6.0 - Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - Microsoft.Extensions.Configuration.FileExtensions (6.0) - restriction: == net6.0 - Microsoft.Extensions.Configuration (>= 6.0) - Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 6.0) - Microsoft.Extensions.FileProviders.Physical (>= 6.0) - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.Configuration.Json (6.0) - restriction: == net6.0 - Microsoft.Extensions.Configuration (>= 6.0) - Microsoft.Extensions.Configuration.Abstractions (>= 6.0) - Microsoft.Extensions.Configuration.FileExtensions (>= 6.0) - Microsoft.Extensions.FileProviders.Abstractions (>= 6.0) - System.Text.Json (>= 6.0) - Microsoft.Extensions.DependencyInjection (6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (6.0) + Microsoft.Extensions.Configuration (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Configuration.Abstractions (>= 7.0) + Microsoft.Extensions.Primitives (>= 7.0) + Microsoft.Extensions.Configuration.Abstractions (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Primitives (>= 7.0) + Microsoft.Extensions.Configuration.Binder (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Configuration.Abstractions (>= 7.0) + Microsoft.Extensions.Configuration.FileExtensions (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Configuration (>= 7.0) + Microsoft.Extensions.Configuration.Abstractions (>= 7.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 7.0) + Microsoft.Extensions.FileProviders.Physical (>= 7.0) + Microsoft.Extensions.Primitives (>= 7.0) + Microsoft.Extensions.Configuration.Json (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Configuration (>= 7.0) + Microsoft.Extensions.Configuration.Abstractions (>= 7.0) + Microsoft.Extensions.Configuration.FileExtensions (>= 7.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 7.0) + System.Text.Json (>= 7.0) + Microsoft.Extensions.DependencyInjection (7.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) + Microsoft.Extensions.DependencyInjection.Abstractions (7.0) Microsoft.Extensions.Features (6.0) - Microsoft.Extensions.FileProviders.Abstractions (6.0) - restriction: == net6.0 - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.FileProviders.Physical (6.0) - restriction: == net6.0 - Microsoft.Extensions.FileProviders.Abstractions (>= 6.0) - Microsoft.Extensions.FileSystemGlobbing (>= 6.0) - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.FileSystemGlobbing (6.0) - restriction: == net6.0 + Microsoft.Extensions.FileProviders.Abstractions (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.Primitives (>= 7.0) + Microsoft.Extensions.FileProviders.Physical (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.Extensions.FileProviders.Abstractions (>= 7.0) + Microsoft.Extensions.FileSystemGlobbing (>= 7.0) + Microsoft.Extensions.Primitives (>= 7.0) + Microsoft.Extensions.FileSystemGlobbing (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) Microsoft.Extensions.Http (6.0) Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) Microsoft.Extensions.Logging (>= 6.0) Microsoft.Extensions.Logging.Abstractions (>= 6.0) Microsoft.Extensions.Options (>= 6.0) - Microsoft.Extensions.Logging (6.0) - Microsoft.Extensions.DependencyInjection (>= 6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - Microsoft.Extensions.Logging.Abstractions (>= 6.0) - Microsoft.Extensions.Options (>= 6.0) - System.Diagnostics.DiagnosticSource (>= 6.0) - Microsoft.Extensions.Logging.Abstractions (6.0) - Microsoft.Extensions.Options (6.0) - Microsoft.Extensions.DependencyInjection.Abstractions (>= 6.0) - Microsoft.Extensions.Primitives (>= 6.0) - Microsoft.Extensions.Primitives (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - Microsoft.JSInterop (6.0) - restriction: == net6.0 - Microsoft.JSInterop.WebAssembly (6.0) - restriction: == net6.0 - Microsoft.JSInterop (>= 6.0) + Microsoft.Extensions.Logging (7.0) + Microsoft.Extensions.DependencyInjection (>= 7.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) + Microsoft.Extensions.Logging.Abstractions (>= 7.0) + Microsoft.Extensions.Options (>= 7.0) + Microsoft.Extensions.Logging.Abstractions (7.0) + Microsoft.Extensions.Options (7.0) + Microsoft.Extensions.DependencyInjection.Abstractions (>= 7.0) + Microsoft.Extensions.Primitives (>= 7.0) + Microsoft.Extensions.Primitives (7.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) + Microsoft.JSInterop (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.JSInterop.WebAssembly (7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) + Microsoft.JSInterop (>= 7.0) - restriction: || (&& (== net6.0) (>= net7.0)) (== net7.0) Nerdbank.GitVersioning (3.5.119) - copy_local: true - System.Diagnostics.DiagnosticSource (6.0) - restriction: == net6.0 - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.IO.Pipelines (6.0) - System.Runtime.CompilerServices.Unsafe (6.0) - System.Text.Encodings.Web (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Json (6.0) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - System.Text.Encodings.Web (>= 6.0) + System.IO.Pipelines (7.0) + System.Runtime.CompilerServices.Unsafe (6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) + System.Text.Encodings.Web (7.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) + System.Text.Json (7.0) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net6.0) (&& (== net7.0) (>= net462)) (&& (== net7.0) (< net6.0)) + System.Text.Encodings.Web (>= 7.0) System.Threading.Channels (6.0) GITHUB remote: fsbolero/bolero - .build/Utility.fs (9d035bca174ddee6fe67c9b3659ce955b34e246f) - src/Bolero.Templating.Provider/Parsing.fs (9d035bca174ddee6fe67c9b3659ce955b34e246f) - src/Bolero.Templating.Provider/Path.fs (9d035bca174ddee6fe67c9b3659ce955b34e246f) \ No newline at end of file + .build/Utility.fs (93c20baf097d7928cb50559954e510889593e8a6) + src/Bolero.Templating.Provider/Parsing.fs (93c20baf097d7928cb50559954e510889593e8a6) + src/Bolero.Templating.Provider/Path.fs (93c20baf097d7928cb50559954e510889593e8a6) \ No newline at end of file diff --git a/src/Bolero.Templating/Client.fs b/src/Bolero.Templating/Client.fs index 2eac355..d095489 100644 --- a/src/Bolero.Templating/Client.fs +++ b/src/Bolero.Templating/Client.fs @@ -42,7 +42,7 @@ type ClientBase() = let cache = ConcurrentDictionary() member this.StoreFileContent(filename, content) = - cache[filename] <- Received (Parsing.ParseFileOrContent content "") + cache[filename] <- Received (Parsing.ParseFileOrContent content "" false) member this.RefreshAllFiles() = cache