update deps (#10)

naninovel · Feb 12, 2024 · a912ecc · a912ecc
1 parent a0164ed
commit a912ecc
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 23 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -33,6 +33,7 @@ jobs:
           languages: ${{ matrix.language }}
       - name: build
         run: |
+          dotnet nuget add source https://nuget.pkg.github.com/naninovel/index.json -n github --username ${{ secrets.GH_USER }} --password ${{ secrets.GH_TOKEN }} --store-password-in-clear-text
           dotnet workload restore backend/Naninovel.Language.sln
           dotnet publish backend
           npm ci

diff --git a/.github/workflows/cover.yml b/.github/workflows/cover.yml
@@ -20,6 +20,7 @@ jobs:
           node-version: 20
       - name: cover
         run: |
+          dotnet nuget add source https://nuget.pkg.github.com/naninovel/index.json -n github --username ${{ secrets.GH_USER }} --password ${{ secrets.GH_TOKEN }} --store-password-in-clear-text
           dotnet workload restore backend/Naninovel.Language.sln
           dotnet test backend /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
           dotnet publish backend

diff --git a/backend/Naninovel.Language.Bindings/Language.cs b/backend/Naninovel.Language.Bindings/Language.cs
@@ -1,15 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
 using Bootsharp;
-using Bootsharp.DependencyInjection;
+using Bootsharp.Inject;
 using Microsoft.Extensions.DependencyInjection;
 using Naninovel.Bindings;
 using Naninovel.Language;
-using static Naninovel.Bindings.Utilities;
 
 [assembly: ExcludeFromCodeCoverage]
-[assembly: JSNamespace(NamespacePattern, NamespaceReplacement)]
+[assembly: JSPreferences(Space = [Space.Pattern, Space.Replacement])]
 [assembly: JSImport(typeof(IDiagnosticPublisher))]
-[assembly: JSExport(
+[assembly: JSExport([
     typeof(ISettingsHandler),
     typeof(IMetadataHandler),
     typeof(IDocumentHandler),
@@ -18,12 +17,12 @@
     typeof(IFoldingHandler),
     typeof(ISymbolHandler),
     typeof(ITokenHandler),
-    typeof(IHoverHandler),
-    InvokePattern = "(.+)", InvokeReplacement = "Naninovel.Bindings.Utilities.Try(() => $1)")]
+    typeof(IHoverHandler)
+])]
 
 namespace Naninovel.Language;
 
-public static partial class Language
+public static class Language
 {
     [JSInvokable]
     public static void BootServer () => new ServiceCollection()

diff --git a/backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj b/backend/Naninovel.Language.Bindings/Naninovel.Language.Bindings.csproj
@@ -12,9 +12,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bootsharp.Common" Version="0.1.0-rc.159"/>
-        <PackageReference Include="Bootsharp.DependencyInjection" Version="0.1.0-rc.159"/>
-        <PackageReference Include="Naninovel.Common.Bindings" Version="2023.10.17.1938"/>
+        <PackageReference Include="Bootsharp.Common" Version="0.3.1"/>
+        <PackageReference Include="Bootsharp.Inject" Version="0.3.1"/>
+        <PackageReference Include="Naninovel.Common.Bindings" Version="2024.2.12.1921"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj b/backend/Naninovel.Language.Test/Naninovel.Language.Test.csproj
@@ -11,11 +11,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Naninovel.Common.TestUtilities" Version="2023.10.17.1938"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23503-02"/>
-        <PackageReference Include="Moq" Version="4.20.69"/>
-        <PackageReference Include="xunit" Version="2.5.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+        <PackageReference Include="Naninovel.Common.TestUtilities" Version="2024.2.12.1921"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
+        <PackageReference Include="Moq" Version="4.20.70"/>
+        <PackageReference Include="xunit" Version="2.6.6"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj b/backend/Naninovel.Language.WASM/Naninovel.Language.WASM.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bootsharp" Version="0.1.0-rc.159"/>
+        <PackageReference Include="Bootsharp" Version="0.3.1"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/backend/Naninovel.Language.WASM/Program.cs b/backend/Naninovel.Language.WASM/Program.cs
@@ -1,9 +1,9 @@
 using System.Diagnostics.CodeAnalysis;
 using Bootsharp;
-using static Naninovel.Bindings.Utilities;
+using Naninovel.Bindings;
 
 [assembly: ExcludeFromCodeCoverage]
-[assembly: JSNamespace(NamespacePattern, NamespaceReplacement)]
+[assembly: JSPreferences(Space = [Space.Pattern, Space.Replacement])]
 
 namespace Naninovel.Language;
 

diff --git a/backend/Naninovel.Language/Naninovel.Language.csproj b/backend/Naninovel.Language/Naninovel.Language.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Naninovel.Common.Modern" Version="2023.10.17.1938"/>
+        <PackageReference Include="Naninovel.Common.Modern" Version="2024.2.12.1921"/>
     </ItemGroup>
 
 </Project>
diff --git a/backend/package.json b/backend/package.json
@@ -1,5 +1,6 @@
 {
     "name": "backend",
-    "main": "Naninovel.Language.WASM/bin/backend/backend.mjs",
-    "types": "Naninovel.Language.WASM/bin/backend/types/backend.d.ts"
+    "type": "module",
+    "main": "Naninovel.Language.WASM/bin/backend/index.mjs",
+    "types": "Naninovel.Language.WASM/bin/backend/types/index.d.ts"
 }
diff --git a/test/server.spec.ts b/test/server.spec.ts
@@ -94,8 +94,7 @@ test("when applying custom metadata update metadata is invoked", () => {
 });
 
 test("publish diagnostics on backend routes to send diagnostics", () => {
-    // @ts-ignore
-    cs.DiagnosticPublisher.$publishDiagnostics("foo", []);
+    cs.DiagnosticPublisher.publishDiagnostics("foo", []);
     expect(connection.sendDiagnostics).toBeCalledWith({ uri: "foo", diagnostics: [] });
 });