From b6a96f8e6e8b3634981670d00d7ddc0f2abbc9ec Mon Sep 17 00:00:00 2001
From: Benedek Farkas <benedek.farkas@lombiq.com>
Date: Fri, 3 Oct 2025 16:35:20 +0200
Subject: [PATCH] Moving Underscore files to a subfolder

---
 src/Orchard.Web/Modules/Orchard.Resources/Assets.json         | 2 +-
 .../Modules/Orchard.Resources/Orchard.Resources.csproj        | 4 ++--
 .../Modules/Orchard.Resources/ResourceManifests/Underscore.cs | 4 +++-
 .../Orchard.Resources/Scripts/{ => Underscore}/underscore.js  | 0
 .../Scripts/{ => Underscore}/underscore.min.js                | 0
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename src/Orchard.Web/Modules/Orchard.Resources/Scripts/{ => Underscore}/underscore.js (100%)
 rename src/Orchard.Web/Modules/Orchard.Resources/Scripts/{ => Underscore}/underscore.min.js (100%)

diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Assets.json b/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
index 066fe967a..cbefb5214 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Assets.json
@@ -71,7 +71,7 @@
     },
     {
         "inputs": [ "Assets/Js/Underscore/underscore.js" ],
-        "output": "Scripts/underscore.js"
+        "output": "Scripts/Underscore/underscore.js"
     },
     {
         "inputs": [ "Assets/Js/History/history.js" ],
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
index 7ed72e09a..c5d47cd73 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj
@@ -770,8 +770,8 @@
     <Content Include="Scripts\Moment\moment.min.js" />
     <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.js" />
     <Content Include="Scripts\jQuery.TimeEntry\jquery.timeentry.min.js" />
-    <Content Include="Scripts\underscore.js" />
-    <Content Include="Scripts\underscore.min.js" />
+    <Content Include="Scripts\Underscore\underscore.js" />
+    <Content Include="Scripts\Underscore\underscore.min.js" />
     <Content Include="Scripts\uri.js" />
     <Content Include="Scripts\uri.min.js" />
     <Content Include="Styles\Bootstrap\bootstrap-grid.css" />
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Underscore.cs b/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Underscore.cs
index 1c3f6035a..af48fc66d 100644
--- a/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Underscore.cs
+++ b/src/Orchard.Web/Modules/Orchard.Resources/ResourceManifests/Underscore.cs
@@ -4,7 +4,9 @@ namespace Orchard.Resources.ResourceManifests {
     public class Underscore : IResourceManifestProvider {
         public void BuildManifests(ResourceManifestBuilder builder) {
             var manifest = builder.Add();
-            manifest.DefineScript("Underscore").SetUrl("underscore.min.js", "underscore.js").SetVersion("1.7.0");
+            manifest.DefineScript("Underscore")
+                .SetUrl("Underscore/underscore.min.js", "Underscore/underscore.js")
+                .SetVersion("1.7.0");
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Scripts/underscore.js b/src/Orchard.Web/Modules/Orchard.Resources/Scripts/Underscore/underscore.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Resources/Scripts/underscore.js
rename to src/Orchard.Web/Modules/Orchard.Resources/Scripts/Underscore/underscore.js
diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Scripts/underscore.min.js b/src/Orchard.Web/Modules/Orchard.Resources/Scripts/Underscore/underscore.min.js
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.Resources/Scripts/underscore.min.js
rename to src/Orchard.Web/Modules/Orchard.Resources/Scripts/Underscore/underscore.min.js