Revert "Merge pull request #105 from Lombiq/issue/OSOE-819"

This reverts commit 3ba32a3, reversing changes made to dc88725.
Lombiq · Mar 27, 2024 · d5a32dc · d5a32dc
1 parent 3ba32a3
commit d5a32dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Lombiq.BaseTheme/Lombiq.BaseTheme.csproj b/Lombiq.BaseTheme/Lombiq.BaseTheme.csproj
@@ -59,13 +59,6 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators\Lombiq.HelpfulLibraries.SourceGenerators.csproj" OutputItemType="Analyzer" />
-  </ItemGroup>
-
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
 
-  <ItemGroup>
-    <AdditionalFiles Include="package.json"/>
-  </ItemGroup>
 </Project>
diff --git a/Lombiq.BaseTheme/ResourceManagementOptionsConfiguration.cs b/Lombiq.BaseTheme/ResourceManagementOptionsConfiguration.cs
@@ -1,18 +1,20 @@
 using Lombiq.BaseTheme.Constants;
-using Lombiq.HelpfulLibraries.SourceGenerators;
 using Microsoft.Extensions.Options;
 using OrchardCore.ResourceManagement;
+using System;
 
 namespace Lombiq.BaseTheme;
 
-[ConstantFromJson("NpmBootstrapVersion", "package.json", "bootstrap")]
-public partial class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
+public class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
     private const string WwwRoot = "~/" + FeatureIds.Area + "/";
     private const string Css = WwwRoot + "css/";
     private const string Js = WwwRoot + "js/";
     private const string Vendors = WwwRoot + "vendors/";
 
+    // Make sure to keep this exactly the same version as the "bootstrap" dependency in the package.json file.
+    public static readonly Version NpmBootstrapVersion = new(5, 3, 2);
+
     private static readonly ResourceManifest _manifest = new();
 
     static ResourceManagementOptionsConfiguration()
@@ -30,7 +32,7 @@ static ResourceManagementOptionsConfiguration()
         _manifest
             .DefineScript("bootstrap")
             .SetUrl(Vendors + "bootstrap/js/bootstrap.bundle.min.js", Vendors + "bootstrap/js/bootstrap.bundle.js")
-            .SetVersion(NpmBootstrapVersion);
+            .SetVersion(NpmBootstrapVersion.ToString());
     }
 
     public void Configure(ResourceManagementOptions options) => options.ResourceManifests.Add(_manifest);