2024-11-13 5.3.12 (#1343)

* 2024-11-13 5.3.12 * 2024-11-13 Dependabot PR limit * 2024-11-13 Add pnpm to GHA
Material-Blazor · Nov 13, 2024 · 05d930c · 05d930c
1 parent fd2eac3
commit 05d930c
Show file tree

Hide file tree

Showing 25 changed files with 8,205 additions and 12,199 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,6 +10,7 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"  
+    open-pull-requests-limit: 0
 
 
 
@@ -19,13 +20,15 @@ updates:
       interval: "weekly"
     ignore:
       - dependency-name: "sass"
+    open-pull-requests-limit: 0
 
   - package-ecosystem: "npm"
     directory: "/materia.blazor.website"
     schedule:
       interval: "weekly"
     ignore:
       - dependency-name: "sass"
+    open-pull-requests-limit: 0
 
 
 
@@ -35,24 +38,28 @@ updates:
       interval: "weekly"
     ignore:
       - dependency-name: "Nager.Date"
+    open-pull-requests-limit: 0
 
   - package-ecosystem: "nuget"
     directory: "/materia.blazor.website"
     schedule:
       interval: "weekly"
     ignore:
       - dependency-name: "Nager.Date"
+    open-pull-requests-limit: 0
 
   - package-ecosystem: "nuget"
     directory: "/materia.blazor.website.server"
     schedule:
       interval: "weekly"
     ignore:
       - dependency-name: "Nager.Date"
+    open-pull-requests-limit: 0
 
   - package-ecosystem: "nuget"
     directory: "/materia.blazor.website.webassembly"
     schedule:
       interval: "weekly"
     ignore:
       - dependency-name: "Nager.Date"
+    open-pull-requests-limit: 0
diff --git a/.github/workflows/GithubActionsRelease.yml b/.github/workflows/GithubActionsRelease.yml
@@ -50,6 +50,11 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Run the acceptance tests as the first build action and cancel out the rest if it fails
       run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
 ############################################################################################################
@@ -72,6 +77,11 @@ jobs:
       run: dotnet tool update -g docfx
 
     - name: Build Material.Blazor
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
       run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
 
     - name: Create documentation 🔧
@@ -107,6 +117,11 @@ jobs:
         dotnet-version: '8.x'
 
     - name: Build and Publish Website 🔧
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
       run: >
         dotnet publish ${{env.projectWeb}}
         --configuration ${{env.buildConfiguration}}
@@ -139,6 +154,11 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Download Artifacts 🔻 # The documentation is downloaded into the 'siteDocFx' folder.
       uses: actions/download-artifact@v4
       with:
@@ -185,6 +205,11 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Build Material.Blazor & Generate the NuGet package 🔧
       run: >
         dotnet pack ${{env.projectMB}}

diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
@@ -81,6 +81,11 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Run the acceptance tests as the first build action and cancel out the rest if it fails
       run: dotnet test ${{env.projectTest}} --configuration ${{env.buildConfiguration}}
 
@@ -104,6 +109,11 @@ jobs:
     - name: Setup docfx
       run: dotnet tool update -g docfx
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Build Material.Blazor
       run: dotnet build ${{env.projectMB}} --configuration ${{env.buildConfiguration}}
 
@@ -146,6 +156,11 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Build & Publish Website 🔧
       run: >
         dotnet publish ${{env.projectWeb}}
@@ -205,6 +220,11 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+      with:
+        version: 9.12.2
+
     - name: Build Material.Blazor & Generate the NuGet package 🔧
       run: >
         dotnet pack ${{env.projectMB}}

diff --git a/Material.Blazor.Test/Material.Blazor.Test.csproj b/Material.Blazor.Test/Material.Blazor.Test.csproj
@@ -4,10 +4,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="bunit" Version="1.32.7" />
-		<PackageReference Include="bunit.core" Version="1.32.7" />
-		<PackageReference Include="bunit.web" Version="1.32.7" />
-		<PackageReference Include="NSubstitute" Version="5.1.0" />
+		<PackageReference Include="bunit" Version="1.36.0" />
+		<PackageReference Include="bunit.core" Version="1.36.0" />
+		<PackageReference Include="bunit.web" Version="1.36.0" />
+		<PackageReference Include="NSubstitute" Version="5.3.0" />
 		<PackageReference Include="xunit" Version="2.9.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>

diff --git a/Material.Blazor.Website.Server/Material.Blazor.Website.Server.csproj b/Material.Blazor.Website.Server/Material.Blazor.Website.Server.csproj
@@ -13,14 +13,14 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.10" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.11" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-		<PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
-		<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
+		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+		<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Material.Blazor.Website.WebAssembly/Material.Blazor.Website.WebAssembly.csproj b/Material.Blazor.Website.WebAssembly/Material.Blazor.Website.WebAssembly.csproj
@@ -5,10 +5,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-		<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
+		<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
 		<PackageReference Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
 		<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
 	</ItemGroup>

diff --git a/Material.Blazor.Website/.npmrc b/Material.Blazor.Website/.npmrc
@@ -0,0 +1,2 @@
+engine-strict = true
+shamefully-hoist=true
diff --git a/Material.Blazor.Website/Material.Blazor.Website.csproj b/Material.Blazor.Website/Material.Blazor.Website.csproj
@@ -20,19 +20,17 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<Content Remove="package-lock.json" />
 		<Content Remove="package.json" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="package-lock.json" />
 		<None Include="package.json" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<PackageReference Include="GoogleAnalytics.Blazor" Version="1.0.3" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.10" />
-		<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.10" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.11" />
 		<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
 	</ItemGroup>
 
@@ -43,17 +41,17 @@
 		<UpToDateCheckOutput Include="@(OutputStaticAssetsStyles)" Set="Styles" />
 	</ItemGroup>
 
-	<!--
+
 	<ItemGroup>
 		<InputStaticAssetsScripts Include="scripts\*.ts" />
 		<OutputStaticAssetsScripts Include="wwwroot\js\material.blazor.website.js;wwwroot\js\material.blazor.website.min.js" />
-	-->
+
 	<!-- Keep this Remove/Include pair -->
-	<!--
+
 		<Content Remove="@(OutputStaticAssetsScripts)" />
 		<Content Include="@(OutputStaticAssetsScripts)" />
 	</ItemGroup>
-	-->
+
 
 	<ItemGroup>
 		<InputStaticAssetsStyles Include="styles\*.scss;" />
@@ -67,59 +65,59 @@
 		<ProjectReference Include="..\Material.Blazor\Material.Blazor.csproj" />
 	</ItemGroup>
 
-	<Target Name="CheckIfNpmExists" BeforeTargets="PreBuildEvent">
+	<Target Name="CheckIfpnpmExists" BeforeTargets="PreBuildEvent">
 		<Message Importance="high" Text="***** Building M.B.W" />
-		<Exec Command="npm install" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
-			<Output TaskParameter="ExitCode" PropertyName="NpmReturnCode" />
+		<Exec Command="pnpm install" ContinueOnError="true" StandardOutputImportance="low" StandardErrorImportance="low" LogStandardErrorAsError="false" IgnoreExitCode="true">
+			<Output TaskParameter="ExitCode" PropertyName="pnpmReturnCode" />
 		</Exec>
 	</Target>
 
-	<Target Name="ErrorOutput" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' != '0' ">
+	<Target Name="ErrorOutput" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' != '0' ">
 		<Message Importance="high" Text="**********************************************************************************" />
 		<Message Importance="high" Text="**********************************************************************************" />
 		<Message Importance="high" Text="**********************************************************************************" />
-		<Message Importance="high" Text="***** 'npm --version' return code was $(NpmReturnCode)" />
+		<Message Importance="high" Text="***** 'pnpm --version' return code was $(pnpmReturnCode)" />
 		<Message Importance="high" Text="CSS and JS not built due to the lack of a proper development environment" />
 		<Message Importance="high" Text="See https://material-blazor.com/docs/articles/DevelopmentEnvironment.html" />
 		<Message Importance="high" Text="If the return code is 1, check package.json and package-lock.json" />
-		<Message Importance="high" Text="If the return code is 9009, npm is not present" />
-		<Message Importance="high" Text="For other non-zero return codes, check npm documentation" />
+		<Message Importance="high" Text="If the return code is 9009, pnpm is not present" />
+		<Message Importance="high" Text="For other non-zero return codes, check pnpm documentation" />
 		<Message Importance="high" Text="**********************************************************************************" />
 		<Message Importance="high" Text="**********************************************************************************" />
 		<Message Importance="high" Text="**********************************************************************************" />
 	</Target>
 
-	<Target Name="BuildScripts" Inputs="@(InputStaticAssetsScripts)" Outputs="@(OutputStaticAssetsScripts)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' == '0' ">
+	<Target Name="BuildScripts" Inputs="@(InputStaticAssetsScripts)" Outputs="@(OutputStaticAssetsScripts)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' == '0' ">
 		<Message Importance="high" Text="***** MakeDir wwwroot and wwwroot\js  (M.B.W Scripts)" />
 		<Exec Command="mkdir wwwroot\js" IgnoreExitCode="true" />
 
-		<Message Importance="high" Text="***** npm run build-js (M.B.W Scripts)" />
-		<Exec Command="npm run build-js" />
+		<Message Importance="high" Text="***** pnpm run build-js (M.B.W Scripts)" />
+		<Exec Command="pnpm run build-js" />
 
-		<Message Importance="high" Text="***** npm run build-js-minify (M.B.W Scripts)" />
-		<Exec Command="npm run build-js-minify" />
+		<Message Importance="high" Text="***** pnpm run build-js-minify (M.B.W Scripts)" />
+		<Exec Command="pnpm run build-js-minify" />
 
 	</Target>
 
-	<Target Name="BuildStyles" Inputs="@(InputStaticAssetsStyles)" Outputs="@(OutputStaticAssetsStyles)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfNpmExists" Condition=" '$(NpmReturnCode)' == '0' ">
+	<Target Name="BuildStyles" Inputs="@(InputStaticAssetsStyles)" Outputs="@(OutputStaticAssetsStyles)" BeforeTargets="PreBuildEvent" AfterTargets="CheckIfpnpmExists" Condition=" '$(pnpmReturnCode)' == '0' ">
 		<Message Importance="high" Text="***** mkdir wwwroot and wwwroot\css (M.B.W Styles)" />
 		<Exec Command="mkdir wwwroot\css" IgnoreExitCode="true" />
 
 		<!-- Build minified themes -->
 		<Message Importance="high" Text="***** build material default theme (M.B.W Styles)" />
-		<Exec Command="npm run build-min-material-default" />
+		<Exec Command="pnpm run build-min-material-default" />
 
 		<Message Importance="high" Text="***** build light square theme (M.B.W Styles)" />
-		<Exec Command="npm run build-min-light-square" />
+		<Exec Command="pnpm run build-min-light-square" />
 
 		<Message Importance="high" Text="***** build dark square theme (M.B.W Styles)" />
-		<Exec Command="npm run build-min-dark-square" />
+		<Exec Command="pnpm run build-min-dark-square" />
 
 		<Message Importance="high" Text="***** build rounded theme (M.B.W Styles)" />
-		<Exec Command="npm run build-min-rounded" />
+		<Exec Command="pnpm run build-min-rounded" />
 
 		<Message Importance="high" Text="***** build asymmetric theme (M.B.W Styles)" />
-		<Exec Command="npm run build-min-asymmetric" />
+		<Exec Command="pnpm run build-min-asymmetric" />
 
 	</Target>