New Asset Build Tool

src/OrchardCore.Modules/OrchardCore.Cors/wwwroot/Scripts/cors-admin.js

@@ -1,149 +1,143 @@
-/*
-** NOTE: This file is generated by Gulp and should not be edited directly!
-** Any changes made directly to this file will be overwritten next time its asset group is processed by Gulp.
-*/
-
-var optionsList = Vue.component('options-list', {
-  props: ['options', 'optionType', 'title', 'subTitle'],
-  template: '#options-list',
-  data: function data() {
-    return {
-      'newOption': ''
-    };
-  },
-  methods: {
-    addOption: function addOption(value) {
-      if (value !== null && value !== '') {
-        var noDuplicates = $.inArray(value.toLowerCase(), this.options.map(function (o) {
-          return o.toLowerCase();
-        })) < 0;
-        if (noDuplicates) {
-          this.options.push(value);
+var optionsList = Vue.component('options-list',
+    {
+        props: ['options', 'optionType', 'title', 'subTitle'],
+        template: '#options-list',
+        data: function () {
+            return {
+                'newOption': ''
+            };
+        },
+        methods: {
+            addOption: function (value) {
+                if (value !== null && value !== '') {
+                    var noDuplicates = ($.inArray(value.toLowerCase(), this.options.map(o => o.toLowerCase())) < 0);
+                    if (noDuplicates) {
+                        this.options.push(value);
+                    }
+                }
+            },
+            deleteOption: function (value) {
+                this.options.splice($.inArray(value, this.options), 1);
+            }
         }
-      }
-    },
-    deleteOption: function deleteOption(value) {
-      this.options.splice($.inArray(value, this.options), 1);
-    }
-  }
-});
-var policyDetails = Vue.component('policy-details', {
-  components: {
-    optionsList: optionsList
-  },
-  props: ['policy'],
-  template: '#policy-details'
-});
+    });
+
+var policyDetails = Vue.component('policy-details',
+    {
+        components: { optionsList: optionsList },
+        props: ['policy'],
+        template: '#policy-details'
+    });
+
 var corsApp = new Vue({
-  el: '#corsAdmin',
-  components: {
-    policyDetails: policyDetails,
-    optionsList: optionsList
-  },
-  data: {
-    selectedPolicy: null,
-    policies: null,
-    defaultPolicyName: null
-  },
-  updated: function updated() {
-    this.searchBox();
-  },
-  methods: {
-    newPolicy: function newPolicy() {
-      this.selectedPolicy = {
-        name: 'New policy',
-        allowedOrigins: [],
-        allowAnyOrigin: true,
-        allowedMethods: [],
-        allowAnyMethod: true,
-        allowedHeaders: [],
-        allowAnyHeader: true,
-        allowCredentials: true,
-        isDefaultPolicy: false,
-        exposedHeaders: []
-      };
-    },
-    editPolicy: function editPolicy(policy) {
-      this.selectedPolicy = Object.assign({}, policy);
-      this.selectedPolicy.originalName = this.selectedPolicy.name;
-    },
-    deletePolicy: function deletePolicy(policy, event) {
-      this.selectedPolicy = null;
-      var policyToRemove = this.policies.filter(function (item) {
-        return item.name === policy.name;
-      });
-      if (policyToRemove.length > 0) this.policies.splice($.inArray(policyToRemove[0], this.policies), 1);
-      event.stopPropagation();
-      this.save();
-    },
-    updatePolicy: function updatePolicy(policy, event) {
-      if (policy.isDefaultPolicy) {
-        this.policies.forEach(function (p) {
-          return p.isDefaultPolicy = false;
-        });
-      }
-      if (policy.originalName) {
-        var policyIndex = this.policies.findIndex(function (oldPolicy) {
-          return oldPolicy.name === policy.originalName;
-        });
-        this.policies[policyIndex] = policy;
-      } else {
-        this.policies.push(policy);
-      }
-      this.save();
-      this.back();
+    el: '#corsAdmin',
+    components: { policyDetails: policyDetails, optionsList: optionsList },
+    data: {
+        selectedPolicy: null,
+        policies: null,
+        defaultPolicyName: null
     },
-    save: function save() {
-      document.getElementById('corsSettings').value = JSON.stringify(this.policies);
-      document.getElementById('corsForm').submit();
+    updated: function () {
+        this.searchBox();
     },
-    back: function back() {
-      this.selectedPolicy = null;
-    },
-    searchBox: function searchBox() {
-      var searchBox = $('#search-box');
+    methods: {
+        newPolicy: function () {
+            this.selectedPolicy = {
+                name: 'New policy',
+                allowedOrigins: [],
+                allowAnyOrigin: true,
+                allowedMethods: [],
+                allowAnyMethod: true,
+                allowedHeaders: [],
+                allowAnyHeader: true,
+                allowCredentials: true,
+                isDefaultPolicy: false,
+                exposedHeaders: []
+            };
+        },
+        editPolicy: function (policy) {
+            this.selectedPolicy = Object.assign({}, policy);
+            this.selectedPolicy.originalName = this.selectedPolicy.name;
+        },
+        deletePolicy: function (policy, event) {
+            this.selectedPolicy = null;
+            var policyToRemove = this.policies.filter(function (item) { return item.name === policy.name; });
+            if (policyToRemove.length > 0)
+                this.policies.splice($.inArray(policyToRemove[0], this.policies), 1);
+            event.stopPropagation();
+            this.save();
+        },
+        updatePolicy: function (policy, event) {
+            if (policy.isDefaultPolicy) {
+                this.policies.forEach(p => p.isDefaultPolicy = false);
+            }
 
-      // On Enter, edit the item if there is a single one
-      searchBox.keydown(function (e) {
-        if (e.key == 'Enter') {
-          // Edit the item if there is a single filtered element
-          var visible = $('#corsAdmin > ul > li:visible');
-          if (visible.length == 1) {
-            window.location = visible.find('.edit').attr('href');
-          }
-          return false;
-        }
-      });
+            if (policy.originalName) {
+                var policyIndex = this.policies.findIndex((oldPolicy) => oldPolicy.name === policy.originalName);
+                this.policies[policyIndex] = policy;
+            }
+            else {
+                this.policies.push(policy);
+            }
 
-      // On each keypress filter the list
-      searchBox.keyup(function (e) {
-        var search = $(this).val().toLowerCase();
-        var elementsToFilter = $("[data-filter-value]");
+            this.save();
+            this.back();
+        },
+        save: function () {
+            document.getElementById('corsSettings').value = JSON.stringify(this.policies);
+            document.getElementById('corsForm').submit();
+        },
+        back: function () {
+            this.selectedPolicy = null;
+        },
+        searchBox: function () {
+            var searchBox = $('#search-box');
 
-        // On ESC, clear the search box and display all
-        if (e.keyCode == 27 || search == '') {
-          searchBox.val('');
-          elementsToFilter.toggle(true);
-          $('#list-alert').addClass("d-none");
-        } else {
-          var intVisible = 0;
-          elementsToFilter.each(function () {
-            var text = $(this).data('filter-value').toLowerCase();
-            var found = text.indexOf(search) > -1;
-            $(this).toggle(found);
-            if (found) {
-              intVisible++;
-            }
-          });
+            // On Enter, edit the item if there is a single one
+            searchBox.keydown(function (e) {
+                if (e.key == 'Enter') {
 
-          // We display an alert if a search is not found
-          if (intVisible == 0) {
-            $('#list-alert').removeClass("d-none");
-          } else {
-            $('#list-alert').addClass("d-none");
-          }
+                    // Edit the item if there is a single filtered element
+                    var visible = $('#corsAdmin > ul > li:visible');
+                    if (visible.length == 1) {
+                        window.location = visible.find('.edit').attr('href');
+                    }
+                    return false;
+                }
+            });
+
+            // On each keypress filter the list
+            searchBox.keyup(function (e) {
+                var search = $(this).val().toLowerCase();
+                var elementsToFilter = $("[data-filter-value]");
+
+                // On ESC, clear the search box and display all
+                if (e.keyCode == 27 || search == '') {
+                    searchBox.val('');
+                    elementsToFilter.toggle(true);
+                    $('#list-alert').addClass("d-none");
+                }
+                else {
+                    var intVisible = 0;
+                    elementsToFilter.each(function () {
+                        var text = $(this).data('filter-value').toLowerCase();
+                        var found = text.indexOf(search) > -1;
+                        $(this).toggle(found);
+
+                        if (found) {
+                            intVisible++;
+                        }
+                    });
+
+                    // We display an alert if a search is not found
+                    if (intVisible == 0) {
+                        $('#list-alert').removeClass("d-none");
+                    }
+                    else {
+                        $('#list-alert').addClass("d-none");
+                    }
+                }
+            });
         }
-      });
     }
-  }
-});
+});

src/OrchardCore.Modules/OrchardCore.Media/ResourceManifestOptionsConfiguration.cs

@@ -3,8 +3,7 @@
 
 namespace OrchardCore.Media;
 
-public sealed class ResourceManagementOptionsConfiguration
-    : IConfigureOptions<ResourceManagementOptions>
+public sealed class ResourceManagementOptionsConfiguration : IConfigureOptions<ResourceManagementOptions>
 {
     private static readonly ResourceManifest _manifest;
 
@@ -20,11 +19,9 @@ static ResourceManagementOptionsConfiguration()
 
         _manifest
             .DefineStyle("media")
-            .SetUrl(
-                "~/OrchardCore.Media/Styles/media.min.css",
-                "~/OrchardCore.Media/Styles/media.css"
-            )
+            .SetUrl("~/OrchardCore.Media/Styles/media.min.css", "~/OrchardCore.Media/Styles/media.css")
             .SetVersion("1.0.0");
+
     }
 
     public void Configure(ResourceManagementOptions options)

src/OrchardCore.Modules/OrchardCore.Media/Views/Admin/MediaApplication.cshtml

@@ -9,7 +9,7 @@
     Layout = null;
 }
 
-<div id="mediaApp" style="display:none;" v-on:dragover="handleScrollWhileDrag($event)">
+<div id="mediaApp" v-on:dragover="handleScrollWhileDrag($event)">
     <div id="customdropzone">
         <h3>@T["Drop your media here"]</h3>
         <p>@T["Your files will be uploaded to the current folder when you drop them here"]</p>

src/OrchardCore.Modules/OrchardCore.Media/package.json

@@ -6,6 +6,6 @@
     "blueimp-file-upload": "10.32.0",
     "bootstrap": "5.3.3",
     "jquery": "3.7.1",
-    "vue": "2.6.14"
+    "vue": "^2.6.14"
   }
 }

yarn.lock

@@ -2005,7 +2005,7 @@ __metadata:
     blueimp-file-upload: "npm:10.32.0"
     bootstrap: "npm:5.3.3"
     jquery: "npm:3.7.1"
-    vue: "npm:2.6.14"
+    vue: "npm:^2.6.14"
   languageName: unknown
   linkType: soft
 
@@ -14170,13 +14170,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue@npm:2.6.14":
-  version: 2.6.14
-  resolution: "vue@npm:2.6.14"
-  checksum: 10/382e261c1d995285b1834f093b53d935a537e6afd18a557131890144bcc5b61c87101db70daf8593bd1cdcfad3dcd90a2f4fea35b6ca0cee1e8c6f7f8f88c104
-  languageName: node
-  linkType: hard
-
 "vue@npm:^2.6.14":
   version: 2.7.16
   resolution: "vue@npm:2.7.16"