update patcher

elringus · Jan 4, 2025 · 14c57eb · 14c57eb
1 parent d81fbbc
commit 14c57eb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/src/cs/Bootsharp.Publish/Pack/ModulePatcher/InternalPatcher.cs b/src/cs/Bootsharp.Publish/Pack/ModulePatcher/InternalPatcher.cs
@@ -20,7 +20,6 @@ public void Patch ()
             .Replace("import(", "import(/*@vite-ignore*//*webpackIgnore:true*/"), Encoding.UTF8);
 
         File.WriteAllText(runtime, File.ReadAllText(runtime, Encoding.UTF8)
-            .Replace("pt('WebAssembly resource does not have the expected content type \"application/wasm\", so falling back to slower ArrayBuffer instantiation.')", "true")
             .Replace("import(", "import(/*@vite-ignore*//*webpackIgnore:true*/"), Encoding.UTF8);
 
         File.WriteAllText(native, File.ReadAllText(native, Encoding.UTF8)

diff --git a/src/cs/Bootsharp.Publish/Pack/ModulePatcher/ModulePatcher.cs b/src/cs/Bootsharp.Publish/Pack/ModulePatcher/ModulePatcher.cs
@@ -16,9 +16,18 @@ public void Patch ()
         if (thread) PatchThreading();
         if (embed) new InternalPatcher(dotnet, runtime, native).Patch();
         if (trim) RemoveMaps();
+        RemoveWasmNag();
         CopyInternals();
     }
 
+    private void RemoveWasmNag ()
+    {
+        // Removes "WebAssembly resource does not have the expected content type..." warning.
+
+        File.WriteAllText(dotnet, File.ReadAllText(dotnet, Encoding.UTF8)
+            .Replace("w('WebAssembly resource does not have the expected content type \"application/wasm\", so falling back to slower ArrayBuffer instantiation.')", "true"));
+    }
+
     private void PatchThreading ()
     {
         // Overprotective browser-only assert breaks unit testing:

diff --git a/src/cs/Directory.Build.props b/src/cs/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>0.4.0-alpha.37</Version>
+        <Version>0.4.0-alpha.40</Version>
         <Authors>Elringus</Authors>
         <PackageTags>javascript typescript ts js wasm node deno bun interop codegen</PackageTags>
         <PackageProjectUrl>https://sharp.elringus.com</PackageProjectUrl>

diff --git a/src/js/scripts/cover.sh b/src/js/scripts/cover.sh
@@ -1,3 +1,3 @@
-node --expose-gc ./node_modules/vitest/vitest.mjs run --silent \
+node ./node_modules/vitest/vitest.mjs run \
   --coverage.enabled --coverage.thresholds.100 --coverage.include=**/sideload/*.mjs \
   --coverage.exclude=**/dotnet.* --coverage.allowExternal
diff --git a/src/js/scripts/test.sh b/src/js/scripts/test.sh
@@ -1 +1 @@
-node --expose-gc ./node_modules/vitest/vitest.mjs run --silent
+node ./node_modules/vitest/vitest.mjs run
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		node --expose-gc ./node_modules/vitest/vitest.mjs run --silent
		node ./node_modules/vitest/vitest.mjs run