Skip to content

Commit d300745

Browse files
followynnefollowynne
authored
fix (#164): improve fetch-behavior using react-query caching (#166)
1 parent fc24934 commit d300745

Some content is hidden

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

41 files changed

+2631
-2687
lines changed

‎.github/workflows/DotNET-build.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,22 @@ jobs:
3030
ubuntu-latest:
3131
name: ubuntu-latest
3232
runs-on: ubuntu-latest
33+
3334
steps:
35+
# temporary from here...
36+
- name: Setup dotnet 6
37+
uses: actions/setup-dotnet@v4
38+
with:
39+
dotnet-version: '6.0.x'
40+
- name: Setup dotnet 7
41+
uses: actions/setup-dotnet@v4
42+
with:
43+
dotnet-version: '7.0.x'
44+
- name: Setup dotnet 8
45+
uses: actions/setup-dotnet@v4
46+
with:
47+
dotnet-version: '8.0.x'
48+
# ...to here
3449

3550
- uses: actions/setup-java@v4
3651
with:
@@ -52,7 +67,7 @@ jobs:
5267
SonarToken: ${{ secrets.SONAR_TOKEN }}
5368
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5469

55-
- uses: actions/upload-artifact@v3
70+
- uses: actions/upload-artifact@v4
5671
if: always()
5772
with:
5873
name: test-results

‎.github/workflows/JS-build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
name: ubuntu-latest
3232
runs-on: ubuntu-latest
3333
steps:
34-
3534
- uses: actions/setup-java@v4
3635
with:
3736
distribution: 'temurin'
@@ -68,7 +67,7 @@ jobs:
6867
-Dsonar.test.inclusions=src/Serilog.Ui.Web/src/__tests__/**/*
6968
-Dsonar.javascript.lcov.reportPaths=./src/Serilog.Ui.Web/src/reports/coverage/lcov.info
7069
71-
- uses: actions/upload-artifact@v3
70+
- uses: actions/upload-artifact@v4
7271
if: always()
7372
with:
7473
name: test-results

‎.github/workflows/Release.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,29 @@ 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-
4746
- uses: actions/setup-java@v4
4847
with:
4948
distribution: 'temurin'

‎.nuke/build.schema.json

Lines changed: 110 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,68 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"properties": {
4-
"Configuration": {
5-
"type": "string",
6-
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
7-
"enum": [
8-
"Debug",
9-
"Release"
10-
]
11-
},
12-
"ElasticProvider": {
13-
"type": "string"
14-
},
15-
"MongoProvider": {
16-
"type": "string"
17-
},
18-
"MsSqlProvider": {
19-
"type": "string"
20-
},
21-
"MySqlProvider": {
22-
"type": "string"
23-
},
24-
"NugetApiKey": {
25-
"type": "string",
26-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
27-
},
28-
"PostgresProvider": {
29-
"type": "string"
30-
},
31-
"Solution": {
32-
"type": "string",
33-
"description": "Path to a solution file that is automatically loaded"
34-
},
35-
"SonarToken": {
36-
"type": "string",
37-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
38-
},
39-
"SonarTokenUi": {
40-
"type": "string",
41-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
42-
},
43-
"Ui": {
44-
"type": "string"
45-
}
46-
},
3+
"$ref": "#/definitions/build",
4+
"title": "Build Schema",
475
"definitions": {
48-
"Host": {
49-
"type": "string",
50-
"enum": [
51-
"AppVeyor",
52-
"AzurePipelines",
53-
"Bamboo",
54-
"Bitbucket",
55-
"Bitrise",
56-
"GitHubActions",
57-
"GitLab",
58-
"Jenkins",
59-
"Rider",
60-
"SpaceAutomation",
61-
"TeamCity",
62-
"Terminal",
63-
"TravisCI",
64-
"VisualStudio",
65-
"VSCode"
66-
]
67-
},
68-
"ExecutableTarget": {
69-
"type": "string",
70-
"enum": [
71-
"Backend_Clean",
72-
"Backend_Compile",
73-
"Backend_Report_Ci",
74-
"Backend_Restore",
75-
"Backend_SonarScan_End",
76-
"Backend_SonarScan_Start",
77-
"Backend_Test",
78-
"Backend_Test_Ci",
79-
"Clean",
80-
"Frontend_Build",
81-
"Frontend_Clean",
82-
"Frontend_Restore",
83-
"Frontend_Tests",
84-
"Frontend_Tests_Ci",
85-
"Pack",
86-
"Publish"
87-
]
88-
},
89-
"Verbosity": {
90-
"type": "string",
91-
"description": "",
92-
"enum": [
93-
"Verbose",
94-
"Normal",
95-
"Minimal",
96-
"Quiet"
97-
]
98-
},
99-
"NukeBuild": {
6+
"build": {
7+
"type": "object",
1008
"properties": {
9+
"Configuration": {
10+
"type": "string",
11+
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
12+
"enum": [
13+
"Debug",
14+
"Release"
15+
]
16+
},
10117
"Continue": {
10218
"type": "boolean",
10319
"description": "Indicates to continue a previously failed build attempt"
10420
},
21+
"ElasticProvider": {
22+
"type": "string"
23+
},
10524
"Help": {
10625
"type": "boolean",
10726
"description": "Shows the help text for this build assembly"
10827
},
10928
"Host": {
29+
"type": "string",
11030
"description": "Host for execution. Default is 'automatic'",
111-
"$ref": "#/definitions/Host"
31+
"enum": [
32+
"AppVeyor",
33+
"AzurePipelines",
34+
"Bamboo",
35+
"Bitbucket",
36+
"Bitrise",
37+
"GitHubActions",
38+
"GitLab",
39+
"Jenkins",
40+
"Rider",
41+
"SpaceAutomation",
42+
"TeamCity",
43+
"Terminal",
44+
"TravisCI",
45+
"VisualStudio",
46+
"VSCode"
47+
]
48+
},
49+
"MongoProvider": {
50+
"type": "string"
51+
},
52+
"MsSqlProvider": {
53+
"type": "string"
54+
},
55+
"MySqlProvider": {
56+
"type": "string"
11257
},
11358
"NoLogo": {
11459
"type": "boolean",
11560
"description": "Disables displaying the NUKE logo"
11661
},
62+
"NugetApiKey": {
63+
"type": "string",
64+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
65+
},
11766
"Partition": {
11867
"type": "string",
11968
"description": "Partition to use on CI"
@@ -122,6 +71,9 @@
12271
"type": "boolean",
12372
"description": "Shows the execution plan (HTML)"
12473
},
74+
"PostgresProvider": {
75+
"type": "string"
76+
},
12577
"Profile": {
12678
"type": "array",
12779
"description": "Defines the profiles to load",
@@ -137,22 +89,78 @@
13789
"type": "array",
13890
"description": "List of targets to be skipped. Empty list skips all dependencies",
13991
"items": {
140-
"$ref": "#/definitions/ExecutableTarget"
92+
"type": "string",
93+
"enum": [
94+
"Backend_Clean",
95+
"Backend_Compile",
96+
"Backend_Report_Ci",
97+
"Backend_Restore",
98+
"Backend_SonarScan_End",
99+
"Backend_SonarScan_Start",
100+
"Backend_Test",
101+
"Backend_Test_Ci",
102+
"Clean",
103+
"Frontend_Build",
104+
"Frontend_Clean",
105+
"Frontend_Restore",
106+
"Frontend_Tests",
107+
"Frontend_Tests_Ci",
108+
"Pack",
109+
"Publish"
110+
]
141111
}
142112
},
113+
"Solution": {
114+
"type": "string",
115+
"description": "Path to a solution file that is automatically loaded"
116+
},
117+
"SonarToken": {
118+
"type": "string",
119+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
120+
},
121+
"SonarTokenUi": {
122+
"type": "string",
123+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
124+
},
143125
"Target": {
144126
"type": "array",
145127
"description": "List of targets to be invoked. Default is '{default_target}'",
146128
"items": {
147-
"$ref": "#/definitions/ExecutableTarget"
129+
"type": "string",
130+
"enum": [
131+
"Backend_Clean",
132+
"Backend_Compile",
133+
"Backend_Report_Ci",
134+
"Backend_Restore",
135+
"Backend_SonarScan_End",
136+
"Backend_SonarScan_Start",
137+
"Backend_Test",
138+
"Backend_Test_Ci",
139+
"Clean",
140+
"Frontend_Build",
141+
"Frontend_Clean",
142+
"Frontend_Restore",
143+
"Frontend_Tests",
144+
"Frontend_Tests_Ci",
145+
"Pack",
146+
"Publish"
147+
]
148148
}
149149
},
150+
"Ui": {
151+
"type": "string"
152+
},
150153
"Verbosity": {
154+
"type": "string",
151155
"description": "Logging verbosity during build execution. Default is 'Normal'",
152-
"$ref": "#/definitions/Verbosity"
156+
"enum": [
157+
"Minimal",
158+
"Normal",
159+
"Quiet",
160+
"Verbose"
161+
]
153162
}
154163
}
155164
}
156-
},
157-
"$ref": "#/definitions/NukeBuild"
165+
}
158166
}

‎build/CustomGithubActionsAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public override void Write(CustomFileWriter writer)
8989
{
9090
writer.WriteLine(); // empty line to separate tasks
9191

92-
writer.WriteLine("- uses: actions/upload-artifact@v3");
92+
writer.WriteLine("- uses: actions/upload-artifact@v4");
9393

9494
using (writer.Indent())
9595
{

‎build/_build.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageDownload Include="dotnet-coverage" Version="[17.12.5]"/>
29-
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.3.10]"/>
30-
<PackageDownload Include="dotnet-sonarscanner" Version="[8.0.3]" />
28+
<PackageDownload Include="dotnet-coverage" Version="[17.14.2]"/>
29+
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.4.4]"/>
30+
<PackageDownload Include="dotnet-sonarscanner" Version="[9.2.1]" />
3131
</ItemGroup>
3232
</Project>

‎samples/WebApi/WebApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- Serilog UI packages -->
2323
<ItemGroup>
2424
<!-- comment/uncomment to directly reference Nuget release
25-
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
25+
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
2626
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.1.0"/>
2727
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.1.0"/>
2828
-->

‎samples/WebApp/WebApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<!-- Serilog UI packages -->
3939
<ItemGroup>
4040
<!-- comment/uncomment to directly reference Nuget release
41-
<PackageReference Include="Serilog.UI" Version="3.1.0"/>
41+
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
4242
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="3.1.0"/>
4343
-->
4444

‎src/Serilog.Ui.Web/Serilog.Ui.Web.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageId>Serilog.UI</PackageId>
55
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
66
<LangVersion>latest</LangVersion>
7-
<Version>3.1.0</Version>
7+
<Version>3.1.1</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>

0 commit comments

Comments
 (0)