Merge pull request #133 from gaelj/release

Release 0.6.0
gaelj · Feb 14, 2024 · 14c9b42 · 14c9b42
2 parents 6700174 + 2a14131
commit 14c9b42
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 90 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.0 - 2024-02-14
+
+### 💥 Introduce breaking changes
+
+- Drop IFormFile upload (not supported in WASM). IBrowserFile is still available (#118)
+
 ## 0.5.1 - 2024-02-12
 
 ### ✨ Introduce new features

diff --git a/CodeMirror6/CodeMirror6.csproj b/CodeMirror6/CodeMirror6.csproj
@@ -9,7 +9,7 @@
     <AssemblyName>GaelJ.BlazorCodeMirror6</AssemblyName>
     <IsPackable>true</IsPackable>
     <PackageId>GaelJ.BlazorCodeMirror6</PackageId>
-    <Version>0.5.1</Version>
+    <Version>0.6.0</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -42,9 +42,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.15" Condition="'$(TargetFramework)'=='net7.0'" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" Condition="'$(TargetFramework)'=='net8.0'" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-  </ItemGroup>
   <Target Name="RemoveNodeModulesTarget">
     <RemoveDir Directories="./NodeLib/node_modules" />
   </Target>

diff --git a/CodeMirror6/CodeMirror6Wrapper.razor b/CodeMirror6/CodeMirror6Wrapper.razor
@@ -28,7 +28,6 @@
             TabSize="@TabSize"
             Theme="@Theme"
             UploadBrowserFile="@UploadBrowserFile"
-            UploadFile="@UploadFile"
             MergeViewConfiguration="@MergeViewConfiguration"
             FileNameOrExtension="@FileNameOrExtension"
             HighlightWhitespace="@HighlightWhitespace"

diff --git a/CodeMirror6/CodeMirror6Wrapper.razor.cs b/CodeMirror6/CodeMirror6Wrapper.razor.cs
@@ -109,10 +109,6 @@ public partial class CodeMirror6Wrapper : ComponentBase
     /// </summary>
     [Parameter] public Func<Task<List<CodeMirrorCompletion>>>? GetMentionCompletions { get; set; }
     /// <summary>
-    /// Upload a file to a server and return the URL to the file
-    /// </summary>
-    [Parameter] public Func<IFormFile, Task<string>>? UploadFile { get; set; }
-    /// <summary>
     /// Upload an IBrowserFile to a server and returns the URL to the file
     /// </summary>
     [Parameter] public Func<IBrowserFile, Task<string>>? UploadBrowserFile { get; set; }

diff --git a/CodeMirror6/CodeMirror6WrapperInternal.razor.JsInvokables.cs b/CodeMirror6/CodeMirror6WrapperInternal.razor.JsInvokables.cs
@@ -108,13 +108,10 @@ [JSInvokable] public async Task<List<CodeMirrorDiagnostic>> LintingRequestedFrom
     {
         if (Setup.DebugLogs) Logger.LogInformation("UploadFileFromJS: {fileName}", fileName);
         using var fileStream = new MemoryStream(fileBytes);
-        var customFormFile = new CustomFormFile(fileStream, fileName, contentType);
         var customBrowserFile = new CustomBrowserFile(fileStream, fileName, contentType, lastModified);
-        var fileUrl = UploadFile is not null
-            ? await UploadFile(customFormFile)
-            : UploadBrowserFile is not null
-                ? await UploadBrowserFile(customBrowserFile)
-                : null;
+        var fileUrl = UploadBrowserFile is not null
+            ? await UploadBrowserFile(customBrowserFile)
+            : null;
         if (!string.IsNullOrEmpty(fileUrl)) {
             var imageChar = contentType.StartsWith("image/") ? "!" : string.Empty;
             var imageLink = $"\n{imageChar}[{fileName}]({fileUrl})\n";

diff --git a/CodeMirror6/CodeMirror6WrapperInternal.razor.cs b/CodeMirror6/CodeMirror6WrapperInternal.razor.cs
@@ -113,10 +113,6 @@ public partial class CodeMirror6WrapperInternal : ComponentBase, IAsyncDisposabl
     /// </summary>
     [Parameter] public Func<Task<List<CodeMirrorCompletion>>>? GetMentionCompletions { get; set; }
     /// <summary>
-    /// Upload a file to a server and return the URL to the file
-    /// </summary>
-    [Parameter] public Func<IFormFile, Task<string>>? UploadFile { get; set; }
-    /// <summary>
     /// Upload an IBrowserFile to a server and returns the URL to the file
     /// </summary>
     [Parameter] public Func<IBrowserFile, Task<string>>? UploadBrowserFile { get; set; }

diff --git a/CodeMirror6/Models/CustomFormFile.cs b/CodeMirror6/Models/CustomFormFile.cs
diff --git a/Examples.BlazorServer/Examples.BlazorServer.csproj b/Examples.BlazorServer/Examples.BlazorServer.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.5.1</Version>
+    <Version>0.6.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser" />

diff --git a/Examples.BlazorServerInteractive/Examples.BlazorServerInteractive.csproj b/Examples.BlazorServerInteractive/Examples.BlazorServerInteractive.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-    <Version>0.5.1</Version>
+    <Version>0.6.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Sentry.AspNetCore" Version="4.1.0" />

diff --git a/Examples.BlazorWasm/Examples.BlazorWasm.csproj b/Examples.BlazorWasm/Examples.BlazorWasm.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
-    <Version>0.5.1</Version>
+    <Version>0.6.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser-wasm" />

diff --git a/Examples.Common/Example.razor b/Examples.Common/Example.razor
@@ -120,7 +120,7 @@
     Setup=@Setup
     ReplaceEmojiCodes=@ReplaceEmojiCodes
     GetMentionCompletions=@GetMentionCompletions
-    UploadFile=@UploadFile
+    UploadBrowserFile=@UploadBrowserFile
     Editable=@(!ReadOnly)
     ReadOnly=@ReadOnly
     LineNumbers=@(!ReadOnly)
@@ -349,7 +349,7 @@
     private string ButtonClass(bool enabled) => enabled
         ? "btn btn-sm btn-primary"
         : "btn btn-sm btn-outline-secondary";
-    private List<string> Styles = [];
+    private List<string> Styles = [];
 
     private async Task ToggleEmojis(CMCommandDispatcher commands)
     {
@@ -385,9 +385,9 @@
         return Task.FromResult(result);
     }
 
-    private async Task<string> UploadFile(Microsoft.AspNetCore.Http.IFormFile file)
+    private async Task<string> UploadBrowserFile(IBrowserFile file)
     {
-        var fileBytes = new byte[file.Length];
+        var fileBytes = new byte[file.Size];
         await file.OpenReadStream().ReadAsync(fileBytes);
         var base64 = Convert.ToBase64String(fileBytes);
         var mimeType = file.ContentType;

diff --git a/Examples.Common/Examples.Common.csproj b/Examples.Common/Examples.Common.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
-    <Version>0.5.1</Version>
+    <Version>0.6.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <SupportedPlatform Include="browser" />

diff --git a/NEW_CHANGELOG.md b/NEW_CHANGELOG.md
@@ -1,13 +1,3 @@
-### ✨ Introduce new features
+### 💥 Introduce breaking changes
 
-- Implement foldMarkdownCodeBlocks
-- Show styles at selection in example
-
-### 🔊 Add or update logs
-
-- Clarify log message
-- Log config and setup at initialization
-
-### 🥅 Catch errors
-
-- Check for existence of the parent div and error out immediately if not found
+- Drop IFormFile upload (not supported in WASM). IBrowserFile is still available (#118)