Update the sort logic in the assets grouping

gulpfile.js

@@ -114,14 +114,25 @@ function getAssetGroups() {
 function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
     assetGroup.manifestPath = assetManifestPath.replace(/\\/g, '/');
     assetGroup.basePath = path.dirname(assetGroup.manifestPath);
-    var inputPaths = assetGroup.inputs.map(function (inputPath) {
-        return path.resolve(path.join(assetGroup.basePath, inputPath)).replace(/\\/g, '/');
-    });
 
-    // For wildcard input paths also sortthem to ensure file concatenation is consistent.
-    if (inputPaths.some(path => path.includes('*'))) {
-        inputPaths = glob.sync(inputPaths, {}).sort();
-    }
+    var inputPaths = [];
+
+    // The inputPaths can contain either a physical path to a file or a path with a wildcard.
+    // It's crucial to maintain the order of each file based on its position in the assets.json file.
+    // When a path contains a wildcard, we need to convert the wildcard to physical paths
+    // and sort them independently of the previous paths to ensure consistent concatenation.
+    assetGroup.inputs.forEach(inputPath => {
+
+        var resolvedPath = path.resolve(path.join(assetGroup.basePath, inputPath)).replace(/\\/g, '/');
+
+        if (resolvedPath.includes('*')) {
+            glob.sync(resolvedPath, {}).sort().forEach(p => {
+                inputPaths.push(p);
+            });
+        } else {
+            inputPaths.push(resolvedPath);
+        }
+    });
 
     assetGroup.inputPaths = inputPaths;
 
@@ -263,7 +274,6 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
         target: "es5",
     };
 
-    console.log(assetGroup.inputPaths);
     return gulp.src(assetGroup.inputPaths)
         .pipe(gulpif(!doRebuild,
             gulpif(doConcat,

src/OrchardCore.Modules/OrchardCore.AdminMenu/wwwroot/Scripts/admin-menu-icon-picker.js

@@ -5395,7 +5395,6 @@ var iconPickerVue = new Vue({
         search: '<input type="search" class="form-control iconpicker-search" placeholder="" />' // just to leave empty the placeholder because it is not localized
       }
     });
-
     $('#inline-picker').on('iconpickerSelected', function (e) {
       var selected = e.iconpickerInstance.options.fullClassFormatter(e.iconpickerValue);
       if (self.targetInputField) {

src/OrchardCore.Modules/OrchardCore.AdminMenu/wwwroot/Scripts/admin-menu.js

@@ -429,7 +429,6 @@
       this._sort_current = this.domPosition.prev ? $(this.domPosition.prev).next().index() : 0;
       $.ui.sortable.prototype._mouseStop.apply(this, arguments); //asybnchronous execution, @see _clear for the relocate event.
     },
-
     // mjs - this function is slightly modified
     // to make it easier to hover over a collapsed element and have it expand
     _intersectsWithSides: function _intersectsWithSides(item) {
@@ -497,7 +496,6 @@
         if (data.nestedSortableItem) {
           delete data.nestedSortableItem; // Remove the nestedSortableItem object from the data
         }
-
         if (id) {
           currentItem = {
             "id": id[2]

src/OrchardCore.Modules/OrchardCore.AuditTrail/wwwroot/Scripts/diff.js

@@ -676,7 +676,6 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       // hunk can't fit on the text. Return undefined
     };
   }
-
   function applyPatch(source, uniDiff) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     if (typeof uniDiff === 'string') {

src/OrchardCore.Modules/OrchardCore.Flows/wwwroot/Scripts/flows.edit.js

@@ -7,8 +7,8 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }