Skip to content

Commit 7049af3

Browse files
followynnefollowynne
authored
feat: upgrade Node pkgs (React 19, Vite 8), replace eslint with simpler approach (#199)
1 parent 307873f commit 7049af3

116 files changed

Lines changed: 6017 additions & 5468 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/DotNET-build.yml‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,31 @@ jobs:
3333
steps:
3434
- uses: actions/setup-dotnet@v5
3535
with:
36-
dotnet-version: '8.0.x'
36+
dotnet-version: "8.0.x"
3737

3838
- uses: actions/setup-dotnet@v5
3939
with:
40-
dotnet-version: '10.0.x'
40+
dotnet-version: "10.0.x"
41+
42+
- uses: actions/setup-node@v6
43+
with:
44+
node-version: "24.x"
4145

4246
- uses: actions/setup-java@v5
4347
with:
44-
distribution: 'temurin'
45-
java-version: '25'
48+
distribution: "temurin"
49+
java-version: "25"
4650
- uses: actions/checkout@v6
4751
with:
4852
fetch-depth: 0
49-
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
53+
- name: "Cache: .nuke/temp, ~/.nuget/packages"
5054
uses: actions/cache@v5
5155
with:
5256
path: |
5357
.nuke/temp
5458
~/.nuget/packages
5559
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
56-
- name: 'Run: Backend_SonarScan_End'
60+
- name: "Run: Backend_SonarScan_End"
5761
run: ./build.cmd Backend_SonarScan_End
5862
env:
5963
SonarToken: ${{ secrets.SONAR_TOKEN }}
@@ -63,4 +67,4 @@ jobs:
6367
if: always()
6468
with:
6569
name: test-results
66-
path: '**/test-results.trx'
70+
path: "**/test-results.trx"

‎.github/workflows/JS-build.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,25 @@ jobs:
3131
name: ubuntu-latest
3232
runs-on: ubuntu-latest
3333
steps:
34+
- uses: actions/setup-node@v6
35+
with:
36+
node-version: "24.x"
37+
3438
- uses: actions/setup-java@v5
3539
with:
36-
distribution: 'temurin'
37-
java-version: '25'
40+
distribution: "temurin"
41+
java-version: "25"
3842
- uses: actions/checkout@v6
3943
with:
4044
fetch-depth: 0
41-
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
45+
- name: "Cache: .nuke/temp, ~/.nuget/packages"
4246
uses: actions/cache@v5
4347
with:
4448
path: |
4549
.nuke/temp
4650
~/.nuget/packages
4751
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
48-
- name: 'Run: Frontend_Tests_Ci'
52+
- name: "Run: Frontend_Tests_Ci"
4953
run: ./build.cmd Frontend_Tests_Ci
5054
env:
5155
SonarTokenUi: ${{ secrets.SONAR_TOKEN_UI }}
@@ -71,4 +75,4 @@ jobs:
7175
if: always()
7276
with:
7377
name: test-results
74-
path: '**/test-junit-report.xml'
78+
path: "**/test-junit-report.xml"

‎.github/workflows/Release.yml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,48 @@ on:
2020
workflow_dispatch:
2121
inputs:
2222
ElasticProvider:
23-
description: 'Elastic Provider'
23+
description: "Elastic Provider"
2424
required: true
2525
MongoProvider:
26-
description: 'Mongo Provider'
26+
description: "Mongo Provider"
2727
required: true
2828
MsSqlProvider:
29-
description: 'Ms Sql Provider'
29+
description: "Ms Sql Provider"
3030
required: true
3131
MySqlProvider:
32-
description: 'My Sql Provider'
32+
description: "My Sql Provider"
3333
required: true
3434
PostgresProvider:
35-
description: 'Postgres Provider'
35+
description: "Postgres Provider"
3636
required: true
3737
Ui:
38-
description: 'Ui'
38+
description: "Ui"
3939
required: true
4040

4141
jobs:
4242
ubuntu-latest:
4343
name: ubuntu-latest
4444
runs-on: ubuntu-latest
4545
steps:
46+
- uses: actions/setup-node@v6
47+
with:
48+
node-version: "24.x"
49+
4650
- uses: actions/setup-java@v5
4751
with:
48-
distribution: 'temurin'
49-
java-version: '25'
52+
distribution: "temurin"
53+
java-version: "25"
5054
- uses: actions/checkout@v6
5155
with:
5256
fetch-depth: 0
53-
- name: 'Cache: .nuke/temp, ~/.nuget/packages'
57+
- name: "Cache: .nuke/temp, ~/.nuget/packages"
5458
uses: actions/cache@v5
5559
with:
5660
path: |
5761
.nuke/temp
5862
~/.nuget/packages
5963
key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
60-
- name: 'Run: Publish'
64+
- name: "Run: Publish"
6165
run: ./build.cmd Publish
6266
env:
6367
ElasticProvider: ${{ github.event.inputs.ElasticProvider }}
@@ -75,7 +79,7 @@ jobs:
7579
if: always()
7680
with:
7781
name: DotNET - Tests
78-
path: '**/test-results.trx'
82+
path: "**/test-results.trx"
7983
reporter: dotnet-trx
8084
fail-on-error: false
8185

@@ -99,6 +103,6 @@ jobs:
99103
if: always()
100104
with:
101105
name: JS - Tests
102-
path: '**/test-junit-report.xml'
106+
path: "**/test-junit-report.xml"
103107
reporter: jest-junit
104108
fail-on-error: false

‎build/CustomGithubActionsAttribute.cs‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected override GitHubActionsJob GetJobs(GitHubActionsImage image, IReadOnlyC
2727
var job = base.GetJobs(image, relevantTargets);
2828
GitHubActionsStep[] backendSteps = AddGithubActions.Any(act => act == GithubAction.Backend_Artifact) ?
2929
[new GitHubActionSetupDotnet("8.0.x"), new GitHubActionSetupDotnet("10.0.x"),] : [];
30-
GitHubActionsStep[] setupSteps = [.. backendSteps, new GitHubActionSetupJava25(), .. job.Steps];
30+
GitHubActionsStep[] setupSteps = [.. backendSteps, new GitHubActionSetupNode(), new GitHubActionSetupJava25(), .. job.Steps];
3131
var newSteps = new List<GitHubActionsStep>(setupSteps);
3232

3333
foreach (var act in AddGithubActions)
@@ -81,6 +81,29 @@ public override void Write(CustomFileWriter writer)
8181
}
8282
}
8383

84+
/// <summary>
85+
/// using: https://github.com/actions/setup-node
86+
/// </summary>
87+
class GitHubActionSetupNode : GitHubActionsStep
88+
{
89+
public override void Write(CustomFileWriter writer)
90+
{
91+
writer.WriteLine(); // empty line to separate tasks
92+
93+
writer.WriteLine("- uses: actions/setup-node@v6");
94+
95+
using (writer.Indent())
96+
{
97+
writer.WriteLine("with:");
98+
99+
using (writer.Indent())
100+
{
101+
writer.WriteLine($"node-version: '24.x'");
102+
}
103+
}
104+
}
105+
}
106+
84107
class GitHubActionSetupDotnet(string dotnetV) : GitHubActionsStep
85108
{
86109
public override void Write(CustomFileWriter writer)

‎samples/WebApi/WebApi.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<!-- Serilog UI packages -->
2323
<ItemGroup>
2424
<!-- comment/uncomment to directly reference Nuget release
25-
<PackageReference Include="Serilog.UI" Version="3.2.0"/>
26-
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.2.0"/>
27-
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.2.0"/>
25+
<PackageReference Include="Serilog.UI" Version="4.0.0"/>
26+
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="4.0.0"/>
27+
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="4.0.0"/>
2828
-->
2929

3030
<!-- comment/uncomment to directly reference solution projects -->

‎samples/WebApp/WebApp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<!-- Serilog UI packages -->
3131
<ItemGroup>
3232
<!-- comment/uncomment to directly reference Nuget release
33-
<PackageReference Include="Serilog.UI" Version="3.2.0"/>
34-
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="4.0.0"/>
33+
<PackageReference Include="Serilog.UI" Version="4.0.0"/>
34+
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="5.0.0"/>
3535
-->
3636

3737
<!-- comment/uncomment to directly reference solution projects -->

‎src/Serilog.Ui.Core/Serilog.Ui.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>netstandard2.1</TargetFramework>
44
<GenerateDocumentationFile>True</GenerateDocumentationFile>
55
<LangVersion>latest</LangVersion>
6-
<Version>3.1.0</Version>
6+
<Version>4.0.0</Version>
77
</PropertyGroup>
88

99
<ItemGroup>

‎src/Serilog.Ui.ElasticSearchProvider/Serilog.Ui.ElasticSearchProvider.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<TargetFramework>netstandard2.1</TargetFramework>
77
<LangVersion>latest</LangVersion>
8-
<Version>3.1.0</Version>
8+
<Version>4.0.0</Version>
99

1010
<Authors>Ricardo Demauro - rmauro.dev</Authors>
1111
<Description>ElasticSearch data provider for Serilog UI.</Description>

‎src/Serilog.Ui.MongoDbProvider/Serilog.Ui.MongoDbProvider.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageId>Serilog.UI.MongoDbProvider</PackageId>
55
<TargetFramework>netstandard2.1</TargetFramework>
66
<LangVersion>latest</LangVersion>
7-
<Version>4.0.0</Version>
7+
<Version>5.0.0</Version>
88

99
<Authors>Christian Haase</Authors>
1010
<Description>MongoDB data provider for Serilog UI.</Description>

‎src/Serilog.Ui.MsSqlServerProvider/Serilog.Ui.MsSqlServerProvider.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<TargetFramework>netstandard2.1</TargetFramework>
77
<LangVersion>latest</LangVersion>
8-
<Version>3.2.0</Version>
8+
<Version>4.0.0</Version>
99

1010
<Description>Microsoft SQL Server data provider for Serilog UI.</Description>
1111
<PackageTags>serilog serilog-ui serilog.sinks.mssqlserver mssqlserver</PackageTags>

0 commit comments

Comments
 (0)