Skip to content

Commit 67be703

Browse files
rajsiterajsite
authored
Ok Blazor (#2707)
# Pull Request ## 🤨 Rationale Adds the OKBlazor package. ## 👩‍💻 Implementation Followed the same pattern as spright. ## 🧪 Testing Added the unit and acceptance test infra. ## ✅ Checklist - [x] I have updated the project documentation to reflect my changes or determined no changes are needed. Doc updates will be part of (feel free to capture in this PR and will be addressed in the follow-on): #2700 --------- Co-authored-by: rajsite <1588923+rajsite@users.noreply.github.com>
1 parent 3fb3cfa commit 67be703

Some content is hidden

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

55 files changed

+2219
-43
lines changed

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,24 @@ jobs:
4444
# Required for chromatic change detection
4545
fetch-depth: 0
4646

47-
# Install dependencies
48-
- name: Remove pre-existing dotnet installs
49-
run: sudo apt remove --purge '^dotnet-.*' '^aspnetcore-.*'
50-
working-directory: packages/blazor-workspace/
47+
# Remove existing dotnet installs, both package managed versions and manual versions
48+
# See https://github.com/dotnet/sdk/issues/39635#issuecomment-3075858666
49+
- run: dotnet --info
50+
- run: sudo apt remove --purge '^dotnet-.*' '^aspnetcore-.*'
5151
- run: sudo rm -rf /usr/share/dotnet/
52+
53+
# Install dependencies
5254
- uses: actions/setup-dotnet@v4
5355
with:
5456
global-json-file: packages/blazor-workspace/global.json
57+
- run: dotnet restore --locked-mode
58+
working-directory: packages/blazor-workspace/
5559
- uses: actions/setup-node@v4
5660
with:
5761
node-version: '24'
5862
registry-url: 'https://registry.npmjs.org'
5963
cache: 'npm'
6064
- run: npm ci
61-
- run: dotnet restore --locked-mode
62-
working-directory: packages/blazor-workspace/
6365

6466
# print a log of outdated npm dependencies
6567
# only informational so swallow error codes

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ package-lock.json
116116
!.vscode/extensions.json
117117
!.vscode/tasks.json
118118

119+
# visual studio
120+
.vs
121+
119122
# macOS
120123
.DS_Store
121124

‎change/@ni-ok-blazor-82ab499b-57a1-4e60-82b3-7b6e79b55733.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "OkBlazor first release",
4+
"packageName": "@ni/ok-blazor",
5+
"email": "rajsite@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}

‎package-lock.json‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"packages/blazor-workspace",
6060
"packages/blazor-workspace/NimbleBlazor",
6161
"packages/blazor-workspace/SprightBlazor",
62+
"packages/blazor-workspace/OkBlazor",
6263
"packages/performance",
6364
"packages/site"
6465
],

‎packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,13 +485,13 @@
485485
<spright-chat-input slot="input" placeholder="Type here" (send)="onChatInputSend($event)"></spright-chat-input>
486486
</spright-chat-conversation>
487487
</div>
488-
<div class="sub-container">
489-
<div class="container-label">Button (Ok)</div>
490-
<ok-button>Ok</ok-button>
491-
</div>
492488
<div class="sub-container">
493489
<div class="container-label">Rectangle (Spright)</div>
494490
<spright-rectangle>Spright!</spright-rectangle>
495491
</div>
492+
<div class="sub-container">
493+
<div class="container-label">Button (Ok)</div>
494+
<ok-button>Ok</ok-button>
495+
</div>
496496
</div>
497497
</div>

‎packages/blazor-workspace/.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# Folders
2-
NimbleBlazor/wwwroot/nimble-*/
2+
NimbleBlazor/wwwroot/nimble-tokens/
3+
NimbleBlazor/wwwroot/nimble-components/
34
NimbleBlazor/wwwroot/NimbleBlazor.HybridWorkaround.js
45
NimbleBlazor/Components/Icons/
56
SprightBlazor/wwwroot/nimble-tokens/
67
SprightBlazor/wwwroot/spright-components/
78
SprightBlazor/wwwroot/SprightBlazor.HybridWorkaround.js
9+
OkBlazor/wwwroot/nimble-tokens/
10+
OkBlazor/wwwroot/ok-components/
11+
OkBlazor/wwwroot/OkBlazor.HybridWorkaround.js
812
build/generate-playwright-version-properties/dist/
913
artifacts/
1014
bin/

‎packages/blazor-workspace/BlazorWorkspace.sln‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorWorkspace.Testing.Acc
3131
EndProject
3232
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NimbleBlazor.Tests.Acceptance.Client", "Tests\NimbleBlazor.Tests.Acceptance.Client\NimbleBlazor.Tests.Acceptance.Client.csproj", "{27DB8F65-4848-4EA6-A7F2-86EF00D585FD}"
3333
EndProject
34+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OkBlazor", "OkBlazor\OkBlazor.csproj", "{27A63DD2-46B6-4CB5-88AC-54BC8C33F89E}"
35+
EndProject
36+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OkBlazor.Tests", "Tests\OkBlazor.Tests\OkBlazor.Tests.csproj", "{55759337-A266-2487-3ED2-5CF74008565C}"
37+
EndProject
38+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OkBlazor.Tests.Acceptance", "Tests\OkBlazor.Tests.Acceptance\OkBlazor.Tests.Acceptance.csproj", "{24969DA8-F533-734A-489B-92478559077A}"
39+
EndProject
3440
Global
3541
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3642
Debug|Any CPU = Debug|Any CPU
@@ -45,6 +51,14 @@ Global
4551
{1E11DA86-D43D-4CF7-94F5-B4565450BF4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
4652
{1E11DA86-D43D-4CF7-94F5-B4565450BF4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
4753
{1E11DA86-D43D-4CF7-94F5-B4565450BF4C}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{08919E1A-D277-4F26-A85B-05CC736508BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{08919E1A-D277-4F26-A85B-05CC736508BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{08919E1A-D277-4F26-A85B-05CC736508BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{08919E1A-D277-4F26-A85B-05CC736508BB}.Release|Any CPU.Build.0 = Release|Any CPU
4862
{8B6E367C-E472-4E68-98D2-968CFCF6939D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4963
{8B6E367C-E472-4E68-98D2-968CFCF6939D}.Debug|Any CPU.Build.0 = Debug|Any CPU
5064
{8B6E367C-E472-4E68-98D2-968CFCF6939D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -77,29 +91,35 @@ Global
7791
{27DB8F65-4848-4EA6-A7F2-86EF00D585FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
7892
{27DB8F65-4848-4EA6-A7F2-86EF00D585FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
7993
{27DB8F65-4848-4EA6-A7F2-86EF00D585FD}.Release|Any CPU.Build.0 = Release|Any CPU
80-
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
81-
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Debug|Any CPU.Build.0 = Debug|Any CPU
82-
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Release|Any CPU.ActiveCfg = Release|Any CPU
83-
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223}.Release|Any CPU.Build.0 = Release|Any CPU
84-
{08919E1A-D277-4F26-A85B-05CC736508BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85-
{08919E1A-D277-4F26-A85B-05CC736508BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
86-
{08919E1A-D277-4F26-A85B-05CC736508BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
87-
{08919E1A-D277-4F26-A85B-05CC736508BB}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{27A63DD2-46B6-4CB5-88AC-54BC8C33F89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{27A63DD2-46B6-4CB5-88AC-54BC8C33F89E}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{27A63DD2-46B6-4CB5-88AC-54BC8C33F89E}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{27A63DD2-46B6-4CB5-88AC-54BC8C33F89E}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{55759337-A266-2487-3ED2-5CF74008565C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{55759337-A266-2487-3ED2-5CF74008565C}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{55759337-A266-2487-3ED2-5CF74008565C}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{55759337-A266-2487-3ED2-5CF74008565C}.Release|Any CPU.Build.0 = Release|Any CPU
102+
{24969DA8-F533-734A-489B-92478559077A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
103+
{24969DA8-F533-734A-489B-92478559077A}.Debug|Any CPU.Build.0 = Debug|Any CPU
104+
{24969DA8-F533-734A-489B-92478559077A}.Release|Any CPU.ActiveCfg = Release|Any CPU
105+
{24969DA8-F533-734A-489B-92478559077A}.Release|Any CPU.Build.0 = Release|Any CPU
88106
EndGlobalSection
89107
GlobalSection(SolutionProperties) = preSolution
90108
HideSolutionNode = FALSE
91109
EndGlobalSection
92110
GlobalSection(NestedProjects) = preSolution
93111
{1E11DA86-D43D-4CF7-94F5-B4565450BF4C} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
112+
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223} = {638B1C16-782F-4C91-A09C-3569957356DF}
113+
{08919E1A-D277-4F26-A85B-05CC736508BB} = {638B1C16-782F-4C91-A09C-3569957356DF}
94114
{8B6E367C-E472-4E68-98D2-968CFCF6939D} = {638B1C16-782F-4C91-A09C-3569957356DF}
95115
{EAC50129-EF2E-4E7B-98D0-64502E97ED8B} = {638B1C16-782F-4C91-A09C-3569957356DF}
96116
{7C65AEA1-8CA2-48DC-81FE-CE39295BDD4B} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
97117
{CEA7A89F-CF8E-4128-927E-24CBBF2C8C63} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
98118
{8E335572-CD8B-4879-8760-73416CF103B1} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
99119
{D94A4535-51B3-4E70-9582-3F3A44C7A798} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
100120
{27DB8F65-4848-4EA6-A7F2-86EF00D585FD} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
101-
{63AFFE3B-A427-40B4-8079-CE6E6F1E8223} = {638B1C16-782F-4C91-A09C-3569957356DF}
102-
{08919E1A-D277-4F26-A85B-05CC736508BB} = {638B1C16-782F-4C91-A09C-3569957356DF}
121+
{55759337-A266-2487-3ED2-5CF74008565C} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
122+
{24969DA8-F533-734A-489B-92478559077A} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
103123
EndGlobalSection
104124
GlobalSection(ExtensibilityGlobals) = postSolution
105125
SolutionGuid = {38E2A588-0714-41E7-9BA3-D89622560FF9}

‎packages/blazor-workspace/Examples/Demo.Client/packages.lock.json‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
},
2424
"Microsoft.NET.ILLink.Tasks": {
2525
"type": "Direct",
26-
"requested": "[8.0.18, )",
27-
"resolved": "8.0.18",
28-
"contentHash": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA=="
26+
"requested": "[8.0.20, )",
27+
"resolved": "8.0.20",
28+
"contentHash": "Rhcto2AjGvTO62+/VTmBpumBOmqIGp7nYEbTbmEXkCq4yPGxV8whju3/HsIA/bKyo2+DggaYk5+/8sxb1AbPTw=="
2929
},
3030
"Microsoft.NET.Sdk.WebAssembly.Pack": {
3131
"type": "Direct",
32-
"requested": "[8.0.18, )",
33-
"resolved": "8.0.18",
34-
"contentHash": "SoVkRwFwnaX39J1uaI72PTilSJ6OoonIG+2VMpazEaAA9t+aJt2Caf49q76SYv3x9iU8hu1axlMWSkR9rt8nIg=="
32+
"requested": "[8.0.20, )",
33+
"resolved": "8.0.20",
34+
"contentHash": "T8IgvEg6M4INrHw9K89JjslxP0D6fHYiogFvarNPSjfusHdV/KvwJU4YC1+lNOIIgpjslkb4WWSW9IuNxHdPLg=="
3535
},
3636
"NI.CSharp.Analyzers": {
3737
"type": "Direct",
@@ -330,6 +330,7 @@
330330
"Microsoft.AspNetCore.Components.Web": "[8.0.19, )",
331331
"NI.CSharp.Analyzers": "[2.0.28, )",
332332
"NimbleBlazor": "[1.0.0, )",
333+
"OkBlazor": "[1.0.0, )",
333334
"SprightBlazor": "[1.0.0, )"
334335
}
335336
},
@@ -340,6 +341,12 @@
340341
"Microsoft.AspNetCore.Components.Web": "[8.0.19, )"
341342
}
342343
},
344+
"okblazor": {
345+
"type": "Project",
346+
"dependencies": {
347+
"Microsoft.AspNetCore.Components.Web": "[8.0.19, )"
348+
}
349+
},
343350
"sprightblazor": {
344351
"type": "Project",
345352
"dependencies": {

‎packages/blazor-workspace/Examples/Demo.Client/wwwroot/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<a href="" class="reload">Reload</a>
2222
<a class="dismiss">🗙</a>
2323
</div>
24-
<script src="_content/SprightBlazor/spright-components/all-components-bundle.min.js"></script>
24+
<script src="_content/OkBlazor/ok-components/all-components-bundle.min.js"></script>
2525
<script src="_framework/blazor.webassembly.js"></script>
2626
</body>
2727

0 commit comments

Comments
 (0)