Resources dependencies fixes and Vue 3

.github/workflows/assets_validation.yml

@@ -26,7 +26,7 @@ jobs:
       run: |
         npm install -g corepack
         corepack enable
-        yarn
+        yarn --no-check-resolutions
         yarn build -gr
     - name: Check if git has changes
       shell: pwsh

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/ContentPickerField.Edit.cshtml

@@ -14,7 +14,7 @@
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
 }
 
-<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs:2,vue-multiselect:2,vuedraggable:2,sortable"></script>
+<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs:2,vue-multiselect:2,vue-draggable:2,sortable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.ContentItemIds)_FieldWrapper">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/LocalizationSetContentPickerField.Edit.cshtml

@@ -16,7 +16,7 @@
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
 }
 
-<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs:2,vue-multiselect:2,vuedraggable:2,sortable"></script>
+<script asp-name="vue-multiselect-wrapper" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-wrapper.js" at="Foot" depends-on="vuejs:2,vue-multiselect:2,vue-draggable:2,sortable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.LocalizationSets)_FieldWrapper">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/MultiTextFieldSettings.Edit.cshtml

@@ -16,7 +16,7 @@
     </div>
 </div>
 
-<script asp-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.js" asp-name="optionsEditor" at="Foot" depends-on="vuejs:2, vuedraggable:2"></script>
+<script asp-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.js" asp-name="optionsEditor" at="Foot" depends-on="vuejs:2, vue-draggable:2"></script>
 <style asp-src="~/OrchardCore.ContentFields/Styles/optionsEditor.min.css" debug-src="~/OrchardCore.ContentFields/Styles/optionsEditor.css"></style>
 
 <script at="Foot">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/TextFieldPredefinedListEditorSettings.Edit.cshtml

@@ -1,7 +1,7 @@
 @using OrchardCore.ContentFields.Settings
 @model OrchardCore.ContentFields.ViewModels.PredefinedListSettingsViewModel
 
-<script asp-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.js" asp-name="optionsEditor" at="Foot" depends-on="vuejs:2, vuedraggable:2"></script>
+<script asp-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.min.js" debug-src="~/OrchardCore.ContentFields/Scripts/optionsEditor.js" asp-name="optionsEditor" at="Foot" depends-on="vuejs:2, vue-draggable:2"></script>
 <style asp-src="~/OrchardCore.ContentFields/Styles/optionsEditor.min.css" debug-src="~/OrchardCore.ContentFields/Styles/optionsEditor.css"></style>
 
 <script at="Foot">

src/OrchardCore.Modules/OrchardCore.ContentFields/Views/UserPickerField.Edit.cshtml

@@ -13,7 +13,7 @@
     var multiple = settings.Multiple.ToString().ToLowerInvariant();
 }
 
-<script asp-name="vue-multiselect-userpicker" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-userpicker.js" at="Foot" depends-on="vuejs:2,vue-multiselect:2,vuedraggable:2,sortable"></script>
+<script asp-name="vue-multiselect-userpicker" asp-src="~/OrchardCore.ContentFields/Scripts/vue-multiselect-userpicker.js" at="Foot" depends-on="vuejs:2,vue-multiselect:2,vue-draggable:2,sortable"></script>
 <style asp-name="vue-multiselect" at="Foot"></style>
 
 <div class="@Orchard.GetFieldWrapperClasses(Model.PartFieldDefinition)" id="@Html.IdFor(x => x.UserIds)_FieldWrapper">

src/OrchardCore.Modules/OrchardCore.Forms/Views/Items/SelectPart.Fields.Edit.cshtml

@@ -3,7 +3,7 @@
 @using OrchardCore.Forms.Models
 @model SelectPartEditViewModel
 
-<script asp-src="~/OrchardCore.Forms/Scripts/selectOptionsEditor.min.js" debug-src="~/OrchardCore.Forms/Scripts/selectOptionsEditor.js" asp-name="selectOptionsEditor" at="Foot" depends-on="vuejs:2, vuedraggable:2"></script>
+<script asp-src="~/OrchardCore.Forms/Scripts/selectOptionsEditor.min.js" debug-src="~/OrchardCore.Forms/Scripts/selectOptionsEditor.js" asp-name="selectOptionsEditor" at="Foot" depends-on="vuejs:2, vue-draggable:2"></script>
 <style asp-src="~/OrchardCore.Forms/Styles/selectOptionsEditor.min.css" debug-src="~/OrchardCore.Forms/Styles/selectOptionsEditor.css"></style>
 
 <script type="text/x-template" id="select-options-row" asp-name="select-options-row" at="Foot">

src/OrchardCore.Modules/OrchardCore.Liquid/Assets.json

@@ -0,0 +1,20 @@
+[
+    {
+        "action": "run",
+        "name": "liquid-intellisense",
+        "source": "Assets/monaco/",
+        "order": 1,
+        "scripts": {
+            "build": "tsc liquid-intellisense.ts --outDir ../../wwwroot/monaco/ --target ES5 --removeComments true --lib dom,ES2015,es2015.collection,es2015.iterable,es2015.promise",
+            "watch": "tsc liquid-intellisense.ts --outDir ../../wwwroot/monaco/ --target ES5 --removeComments true --lib dom,ES2015,es2015.collection,es2015.iterable,es2015.promise --watch"
+        },
+        "tags": ["admin", "js"]
+    },
+    {
+        "action": "min",
+        "name": "liquid-intellisense2",
+        "source": "wwwroot/monaco/liquid-intellisense.js",
+        "dest": "wwwroot/monaco/",
+        "tags": ["admin", "js"]
+    }
+]

src/OrchardCore.Modules/OrchardCore.Liquid/wwwroot/monaco/liquid-intellisense.js

@@ -1,101 +1,169 @@
-/*
-** 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 liquidTags = ['if', 'else', 'elseif', 'endif', 'render', 'assign', 'capture', 'endcapture', 'case', 'endcase', 'comment', 'endcomment', 'cycle', 'decrement', 'for', 'endfor', 'include', 'increment', 'layout', 'raw', 'endraw', 'render', 'tablerow', 'endtablerow', 'unless', 'endunless'];
-var liquidFilters = ['abs', 'append', 'at_least', 'at_most', 'capitalize', 'ceil', 'compact', 'date', 'default', 'divided_by', 'downcase', 'escape', 'escape_once', 'first', 'floor', 'join', 'json', 'last', 'lstrip', 'map', 'minus', 'modulo', 'newline_to_br', 'plus', 'prepend', 'remove', 'remove_first', 'replace', 'replace_first', 'reverse', 'round', 'rstrip', 'size', 'slice', 'sort', 'sort_natural', 'split', 'strip', 'strip_html', 'strip_newlines', 'times', 'truncate', 'truncatewords', 'uniq', 'upcase', 'url_decode', 'url_encode', 'where'];
+var liquidTags = [
+    'if',
+    'else',
+    'elseif',
+    'endif',
+    'render',
+    'assign',
+    'capture',
+    'endcapture',
+    'case',
+    'endcase',
+    'comment',
+    'endcomment',
+    'cycle',
+    'decrement',
+    'for',
+    'endfor',
+    'include',
+    'increment',
+    'layout',
+    'raw',
+    'endraw',
+    'render',
+    'tablerow',
+    'endtablerow',
+    'unless',
+    'endunless'
+];
+var liquidFilters = [
+    'abs',
+    'append',
+    'at_least',
+    'at_most',
+    'capitalize',
+    'ceil',
+    'compact',
+    'date',
+    'default',
+    'divided_by',
+    'downcase',
+    'escape',
+    'escape_once',
+    'first',
+    'floor',
+    'join',
+    'json',
+    'last',
+    'lstrip',
+    'map',
+    'minus',
+    'modulo',
+    'newline_to_br',
+    'plus',
+    'prepend',
+    'remove',
+    'remove_first',
+    'replace',
+    'replace_first',
+    'reverse',
+    'round',
+    'rstrip',
+    'size',
+    'slice',
+    'sort',
+    'sort_natural',
+    'split',
+    'strip',
+    'strip_html',
+    'strip_newlines',
+    'times',
+    'truncate',
+    'truncatewords',
+    'uniq',
+    'upcase',
+    'url_decode',
+    'url_encode',
+    'where'
+];
 function getLiquidContextInfo(model, position, triggerCharacter) {
-  var inTag;
-  var inObject;
-  var showTags;
-  var showFilters;
-  var findStart = model.findPreviousMatch('\\{(%|\\{)', position, true, false, null, true);
-  if (findStart && findStart.matches && !position.isBefore(findStart.range.getEndPosition())) {
-    if (findStart.matches[1] == '%') {
-      inTag = true;
-    } else if (findStart.matches[1] == '{') {
-      inObject = true;
-    }
-    var searchPattern = inTag ? '%}' : '}}';
-    var findEnd = model.findNextMatch(searchPattern, position, false, false, null, true);
-    var currentRange = findStart.range.plusRange(findEnd.range);
-    if (currentRange.containsPosition(position)) {
-      if (inTag) {
-        var findTagName = model.findNextMatch('\\{%\\s*([a-zA-Z-_]+)', findStart.range.getStartPosition(), true, false, null, true);
-        if (findTagName && currentRange.containsRange(findTagName.range) && findTagName.matches.length > 1) {
-          if (findTagName.matches[1] == 'assign') {
-            showFilters = true;
-          } else {
-            showTags = false;
-          }
-        } else {
-          showTags = true;
+    var inTag;
+    var inObject;
+    var showTags;
+    var showFilters;
+    var findStart = model.findPreviousMatch('\\{(%|\\{)', position, true, false, null, true);
+    if (findStart && findStart.matches && !position.isBefore(findStart.range.getEndPosition())) {
+        if (findStart.matches[1] == '%') {
+            inTag = true;
+        }
+        else if (findStart.matches[1] == '{') {
+            inObject = true;
+        }
+        var searchPattern = inTag ? '%}' : '}}';
+        var findEnd = model.findNextMatch(searchPattern, position, false, false, null, true);
+        var currentRange = findStart.range.plusRange(findEnd.range);
+        if (currentRange.containsPosition(position)) {
+            if (inTag) {
+                var findTagName = model.findNextMatch('\\{%\\s*([a-zA-Z-_]+)', findStart.range.getStartPosition(), true, false, null, true);
+                if (findTagName && currentRange.containsRange(findTagName.range) && findTagName.matches.length > 1) {
+                    if (findTagName.matches[1] == 'assign') {
+                        showFilters = true;
+                    }
+                    else {
+                        showTags = false;
+                    }
+                }
+                else {
+                    showTags = true;
+                }
+            }
+            else {
+                showFilters = true;
+            }
         }
-      } else {
-        showFilters = true;
-      }
     }
-  }
-  return {
-    showFilters: showFilters,
-    showTags: showTags,
-    inTag: inTag,
-    inObject: inObject
-  };
+    return {
+        showFilters: showFilters,
+        showTags: showTags,
+        inTag: inTag,
+        inObject: inObject
+    };
 }
 var completionItemProvider = {
-  triggerCharacters: [' '],
-  provideCompletionItems: function provideCompletionItems(model, position, context, token) {
-    var items = [];
-    if (context.triggerCharacter == ' ') {
-      var startTrigger = model.getValueInRange(new monaco.Range(position.lineNumber, position.column - 3, position.lineNumber, position.column - 1));
-      if (startTrigger != '{%' && !startTrigger.endsWith('|')) {
-        return null;
-      }
-    }
-    var liquidContext = getLiquidContextInfo(model, position, context.triggerCharacter);
-    if (liquidContext.showFilters) {
-      items = liquidFilters;
-    } else if (liquidContext.showTags) {
-      items = liquidTags.filter(function (value) {
-        return !value.startsWith('end');
-      });
+    triggerCharacters: [' '],
+    provideCompletionItems: function (model, position, context, token) {
+        var items = [];
+        if (context.triggerCharacter == ' ') {
+            var startTrigger = model.getValueInRange(new monaco.Range(position.lineNumber, position.column - 3, position.lineNumber, position.column - 1));
+            if (startTrigger != '{%' && !startTrigger.endsWith('|')) {
+                return null;
+            }
+        }
+        var liquidContext = getLiquidContextInfo(model, position, context.triggerCharacter);
+        if (liquidContext.showFilters) {
+            items = liquidFilters;
+        }
+        else if (liquidContext.showTags) {
+            items = liquidTags.filter(function (value) { return !value.startsWith('end'); });
+        }
+        var suggestions = items.map(function (value) {
+            return {
+                label: value,
+                kind: monaco.languages.CompletionItemKind.Keyword,
+                insertText: value,
+                insertTextRules: monaco.languages.CompletionItemInsertTextRule.KeepWhitespace
+            };
+        });
+        return { suggestions: suggestions };
     }
-    var suggestions = items.map(function (value) {
-      return {
-        label: value,
-        kind: monaco.languages.CompletionItemKind.Keyword,
-        insertText: value,
-        insertTextRules: monaco.languages.CompletionItemInsertTextRule.KeepWhitespace
-      };
-    });
-    return {
-      suggestions: suggestions
-    };
-  }
 };
 function ConfigureLiquidIntellisense(monaco, suggestHtml) {
-  if (suggestHtml === void 0) {
-    suggestHtml = true;
-  }
-  if (suggestHtml) {
-    var modeConfiguration = {
-      completionItems: true,
-      colors: true,
-      foldingRanges: true,
-      selectionRanges: true,
-      diagnostics: false,
-      documentFormattingEdits: true,
-      documentRangeFormattingEdits: true
-    };
-    var options = {
-      format: monaco.languages.html.htmlDefaults.options.format,
-      suggest: {
-        html5: true
-      }
-    };
-    monaco.languages.html.registerHTMLLanguageService('liquid', options, modeConfiguration);
-  }
-  monaco.languages.registerCompletionItemProvider('liquid', completionItemProvider);
-}
+    if (suggestHtml === void 0) { suggestHtml = true; }
+    if (suggestHtml) {
+        var modeConfiguration = {
+            completionItems: true,
+            colors: true,
+            foldingRanges: true,
+            selectionRanges: true,
+            diagnostics: false,
+            documentFormattingEdits: true,
+            documentRangeFormattingEdits: true
+        };
+        var options = {
+            format: monaco.languages.html.htmlDefaults.options.format,
+            suggest: { html5: true }
+        };
+        monaco.languages.html.registerHTMLLanguageService('liquid', options, modeConfiguration);
+    }
+    monaco.languages.registerCompletionItemProvider('liquid', completionItemProvider);
+}

src/OrchardCore.Modules/OrchardCore.OpenId/Views/OpenIdClientSettings.Edit.cshtml

@@ -3,7 +3,7 @@
 @using Microsoft.IdentityModel.Protocols.OpenIdConnect
 @model OpenIdClientSettingsViewModel
 
-<script asp-src="~/OrchardCore.OpenId/Scripts/parametersEditor.min.js" debug-src="~/OrchardCore.OpenId/Scripts/parametersEditor.js" asp-name="parametersEditor" at="Foot" depends-on="vuejs:2, vuedraggable:2"></script>
+<script asp-src="~/OrchardCore.OpenId/Scripts/parametersEditor.min.js" debug-src="~/OrchardCore.OpenId/Scripts/parametersEditor.js" asp-name="parametersEditor" at="Foot" depends-on="vuejs:2, vue-draggable:2"></script>
 <style asp-src="~/OrchardCore.OpenId/Styles/parametersEditor.min.css" debug-src="~/OrchardCore.OpenId/Styles/parametersEditor.css"></style>
 
 <script at="Foot">