From 80ef1c7a0860a35b0260e833ee6b0161cd53e442 Mon Sep 17 00:00:00 2001
From: Mohammad Dameer <mdameer@mdameer.com>
Date: Sun, 7 Jul 2024 22:20:29 +0300
Subject: [PATCH] Fix non-debug version loaded for certain static resources
 when debug mode is enabled (#16406)

Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
---
 .../RequireSettings.cs                        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
index ea43b8f3278..8542a0ea570 100644
--- a/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
+++ b/src/OrchardCore/OrchardCore.ResourceManagement.Abstractions/RequireSettings.cs
@@ -7,6 +7,8 @@ namespace OrchardCore.ResourceManagement
 {
     public class RequireSettings
     {
+        private readonly ResourceManagementOptions _options;
+
         private Dictionary<string, string> _attributes;
 
         public string BasePath { get; set; }
@@ -36,6 +38,7 @@ public RequireSettings()
 
         public RequireSettings(ResourceManagementOptions options)
         {
+            _options = options;
             CdnMode = options.UseCdn;
             DebugMode = options.DebugMode;
             Culture = options.Culture;
@@ -258,14 +261,19 @@ public RequireSettings CombinePosition(RequireSettings dependent)
             return this;
         }
 
-        public RequireSettings New() =>
-            new()
-            {
-                Name = Name,
-                Type = Type,
-                Location = Location,
-                Position = Position
-            };
+        public RequireSettings New()
+        {
+            RequireSettings settings = _options != null
+                ? new(_options)
+                : new();
+
+            settings.Name = Name;
+            settings.Type = Type;
+            settings.Location = Location;
+            settings.Position = Position;
+
+            return settings;
+        }
 
         public RequireSettings NewAndCombine(RequireSettings other) =>
             New().Combine(other);