From ac225bb44b00548ce13013cd98e84ad1c14d1799 Mon Sep 17 00:00:00 2001
From: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Date: Wed, 26 Feb 2025 11:11:57 +0200
Subject: [PATCH 1/4] move jquery-noconflict

---
 build/build-modules-js/settings.json            |  5 +++++
 build/media_source/legacy/joomla.asset.json     | 17 -----------------
 .../jquery/jquery-noconflict.esm.js}            |  0
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 build/media_source/legacy/joomla.asset.json
 rename build/media_source/{legacy/js/jquery-noconflict.es5.js => vendor/jquery/jquery-noconflict.esm.js} (100%)

diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json
index 9c0058ef2d1c4..c9b64ffe893c1 100644
--- a/build/build-modules-js/settings.json
+++ b/build/build-modules-js/settings.json
@@ -432,6 +432,11 @@
             "name": "jquery",
             "type": "script",
             "uri": "jquery.min.js"
+          },
+          {
+            "name": "jquery-noconflict",
+            "type": "script",
+            "uri": "jquery-noconflict.min.js"
           }
         ],
         "dependencies": [],
diff --git a/build/media_source/legacy/joomla.asset.json b/build/media_source/legacy/joomla.asset.json
deleted file mode 100644
index f1849ef812c26..0000000000000
--- a/build/media_source/legacy/joomla.asset.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
-  "name": "joomla",
-  "version": "4.0.0",
-  "description": "Joomla CMS",
-  "license": "GPL-2.0-or-later",
-  "assets": [
-    {
-      "name": "jquery-noconflict",
-      "type": "script",
-      "dependencies": [
-        "jquery"
-      ],
-      "uri": "legacy/jquery-noconflict.min.js"
-    }
-  ]
-}
diff --git a/build/media_source/legacy/js/jquery-noconflict.es5.js b/build/media_source/vendor/jquery/jquery-noconflict.esm.js
similarity index 100%
rename from build/media_source/legacy/js/jquery-noconflict.es5.js
rename to build/media_source/vendor/jquery/jquery-noconflict.esm.js

From 64307f0ffb177de47c58e6456ea45e5e12776e5d Mon Sep 17 00:00:00 2001
From: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Date: Thu, 27 Feb 2025 14:40:44 +0200
Subject: [PATCH 2/4] =?UTF-8?q?it=E2=80=99s=20es6=20not=20esm!!!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{jquery-noconflict.esm.js => js/jquery-noconflict.es6.js}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename build/media_source/vendor/jquery/{jquery-noconflict.esm.js => js/jquery-noconflict.es6.js} (100%)

diff --git a/build/media_source/vendor/jquery/jquery-noconflict.esm.js b/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
similarity index 100%
rename from build/media_source/vendor/jquery/jquery-noconflict.esm.js
rename to build/media_source/vendor/jquery/js/jquery-noconflict.es6.js

From 34e87481c1a0dc0d53314600de8d077f66ece61a Mon Sep 17 00:00:00 2001
From: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Date: Fri, 28 Feb 2025 16:39:36 +0200
Subject: [PATCH 3/4] Update jquery-noconflict.es6.js

---
 build/media_source/vendor/jquery/js/jquery-noconflict.es6.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js b/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
index bf4ca21eff9cc..7641941cf21c1 100644
--- a/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
+++ b/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
@@ -1 +1 @@
-var $ = jQuery.noConflict();
+window.$ = jQuery.noConflict();

From f368dfab63eba7c4a6183fd0a0c2c96eb38f5f01 Mon Sep 17 00:00:00 2001
From: Dimitris Grammatikogiannis <dg@dgrammatiko.dev>
Date: Fri, 28 Feb 2025 17:53:29 +0200
Subject: [PATCH 4/4] cs

---
 build/media_source/vendor/jquery/js/jquery-noconflict.es6.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js b/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
index 7641941cf21c1..2f0120d756c81 100644
--- a/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
+++ b/build/media_source/vendor/jquery/js/jquery-noconflict.es6.js
@@ -1 +1,2 @@
+// eslint-disable-next-line no-undef
 window.$ = jQuery.noConflict();