Migrate OrchardCore.Resources assets

Use Glob pattern in new Assets.json file
OrchardCMS · Jan 8, 2025 · 7b19fe8 · 7b19fe8
1 parent fd7c476
commit 7b19fe8
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 9,606 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/Assets.json b/src/OrchardCore.Modules/OrchardCore.Resources/Assets.json
@@ -85,35 +85,28 @@
   },
   {
     "action": "copy",
-    "name": "bootstrap-bundle-js",
+
     "source": "node_modules/bootstrap/dist/js/bootstrap.bundle.js",
     "dest": "wwwroot/Scripts/",
     "tags": ["resources", "js"]
   },
   {
     "action": "copy",
-    "name": "bootstrap-bundle-js",
+
     "source": "node_modules/bootstrap/dist/js/bootstrap.bundle.js.map",
     "dest": "wwwroot/Scripts/",
     "tags": ["resources", "js"]
   },
   {
     "action": "copy",
-    "name": "bootstrap-bundle-js",
+
     "source": "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js",
     "dest": "wwwroot/Scripts/",
     "tags": ["resources", "js"]
   },
   {
     "action": "copy",
-    "name": "bootstrap-bundle-js",
-    "source": "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map",
-    "dest": "wwwroot/Scripts/",
-    "tags": ["resources", "js"]
-  },
-  {
-    "action": "copy",
-    "name": "bootstrap-bundle-js",
+
     "source": "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js.map",
     "dest": "wwwroot/Scripts/",
     "tags": ["resources", "js"]
@@ -291,7 +284,7 @@
     "name": "trumbowyg",
     "source": "node_modules/trumbowyg/dist/ui/icons.svg",
     "dest": "wwwroot/Scripts/trumbowyg/ui/",
-    "tags": ["resources", "css"]
+    "tags": ["resources", "images"]
   },
   {
     "action": "copy",
@@ -335,6 +328,20 @@
     "dest": "wwwroot/Scripts/",
     "tags": ["resources", "js"]
   },
+  {
+    "action": "copy",
+    "name": "vue-multiselect",
+    "source": "node_modules/vue-multiselect/dist/vue-multiselect.min.css*",
+    "dest": "wwwroot/Styles/",
+    "tags": ["resources", "css"]
+  },
+  {
+    "action": "copy",
+    "name": "vuedraggable",
+    "source": "node_modules/vuedraggable/dist/vuedraggable.umd.*",
+    "dest": "wwwroot/Scripts/",
+    "tags": ["resources", "js"]
+  },
   {
     "action": "copy",
     "name": "sortable",
@@ -376,5 +383,33 @@
     "source": "node_modules/nouislider/dist/nouislider.css",
     "dest": "wwwroot/Scripts/nouislider/",
     "tags": ["resources", "css"]
+  },
+  {
+    "action": "copy",
+    "name": "fortawesome",
+    "source": "node_modules/@fortawesome/fontawesome-free/css/*",
+    "dest": "wwwroot/Vendor/fontawesome-free/css/",
+    "tags": ["resources", "css"]
+  },
+  {
+    "action": "copy",
+    "name": "fortawesome",
+    "source": "node_modules/@fortawesome/fontawesome-free/js/*",
+    "dest": "wwwroot/Vendor/fontawesome-free/js/",
+    "tags": ["resources", "js"]
+  },
+  {
+    "action": "copy",
+    "name": "fortawesome",
+    "source": "node_modules/@fortawesome/fontawesome-free/webfonts/*",
+    "dest": "wwwroot/Vendor/fontawesome-free/webfonts/",
+    "tags": ["resources", "fonts"]
+  },
+  {
+    "action": "copy",
+    "name": "monaco",
+    "source": "Assets/monaco/*",
+    "dest": "wwwroot/Scripts/monaco/",
+    "tags": ["resources", "js"]
   }
 ]
diff --git a/src/OrchardCore.Modules/OrchardCore.Resources/GulpAssets.json b/src/OrchardCore.Modules/OrchardCore.Resources/GulpAssets.json
@@ -48,48 +48,6 @@
     ],
     "output": "wwwroot/Scripts/trumbowyg/trumbowyg-plugins.js"
   },
-  {
-    "copy": true,
-    "inputs": [
-      "../../../node_modules/vue-multiselect/dist/vue-multiselect.min.css*"
-    ],
-    "output": "wwwroot/Styles/@"
-  },
-  {
-    "copy": true,
-    "inputs": [
-      "../../../node_modules/vuedraggable/dist/vuedraggable.umd.*"
-    ],
-    "output": "wwwroot/Scripts/@"
-  },
-  {
-    "copy": true,
-    "inputs": [
-      "../../../node_modules/@fortawesome/fontawesome-free/css/*"
-    ],
-    "output": "wwwroot/Vendor/fontawesome-free/css/@"
-  },
-  {
-    "copy": true,
-    "inputs": [
-      "../../../node_modules/@fortawesome/fontawesome-free/js/*"
-    ],
-    "output": "wwwroot/Vendor/fontawesome-free/js/@"
-  },
-  {
-    "copy": true,
-    "inputs": [
-      "../../../node_modules/@fortawesome/fontawesome-free/webfonts/*"
-    ],
-    "output": "wwwroot/Vendor/fontawesome-free/webfonts/@"
-  },
-  {
-    "copy": true,
-    "inputs": [
-      "Assets/monaco/*"
-    ],
-    "output": "wwwroot/Scripts/monaco/@"
-  },
   {
     "copy": true,
     "inputs": [

diff --git a/....Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-brands-400.eot b/....Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-brands-400.eot
diff --git a/...rchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-brands-400.svg b/...rchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-brands-400.svg
diff --git a/...Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-brands-400.woff b/...Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-brands-400.woff
diff --git a/...Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-regular-400.eot b/...Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-regular-400.eot
diff --git a/...chardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-regular-400.svg b/...chardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-regular-400.svg
diff --git a/...odules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-regular-400.woff b/...odules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-regular-400.woff
diff --git a/...e.Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-solid-900.eot b/...e.Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-solid-900.eot
diff --git a/...OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-solid-900.svg b/...OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-solid-900.svg
diff --git a/....Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-solid-900.woff b/....Modules/OrchardCore.Resources/wwwroot/Vendor/fontawesome-free/webfonts/fa-solid-900.woff