diff --git a/administrator/components/com_media/resources/scripts/app/Api.es6.js b/administrator/components/com_media/resources/scripts/app/Api.mjs
similarity index 98%
rename from administrator/components/com_media/resources/scripts/app/Api.es6.js
rename to administrator/components/com_media/resources/scripts/app/Api.mjs
index 783f46fa5a4a2..63cc73096cfce 100644
--- a/administrator/components/com_media/resources/scripts/app/Api.es6.js
+++ b/administrator/components/com_media/resources/scripts/app/Api.mjs
@@ -1,5 +1,5 @@
-import notifications from './Notifications.es6';
-import { dirname } from './path';
+import notifications from './Notifications.mjs';
+import { dirname } from './path.mjs';
 
 /**
  * Normalize a single item
diff --git a/administrator/components/com_media/resources/scripts/app/Event.es6.js b/administrator/components/com_media/resources/scripts/app/Event.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/app/Event.es6.js
rename to administrator/components/com_media/resources/scripts/app/Event.mjs
diff --git a/administrator/components/com_media/resources/scripts/app/Notifications.es6.js b/administrator/components/com_media/resources/scripts/app/Notifications.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/app/Notifications.es6.js
rename to administrator/components/com_media/resources/scripts/app/Notifications.mjs
diff --git a/administrator/components/com_media/resources/scripts/app/path.js b/administrator/components/com_media/resources/scripts/app/path.mjs
similarity index 82%
rename from administrator/components/com_media/resources/scripts/app/path.js
rename to administrator/components/com_media/resources/scripts/app/path.mjs
index dbfc45d03f6bf..8506a353fe657 100644
--- a/administrator/components/com_media/resources/scripts/app/path.js
+++ b/administrator/components/com_media/resources/scripts/app/path.mjs
@@ -1,6 +1,6 @@
 export const dirname = (path) => {
   if (typeof path !== 'string') {
-    throw new TypeError('Path must be a string. Received ' + JSON.stringify(path));
+    throw new TypeError(`Path must be a string. Received ${JSON.stringify(path)}`);
   }
 
   if (path.length === 0) return '.';
@@ -8,6 +8,8 @@ export const dirname = (path) => {
   const hasRoot = code === 47;
   let end = -1;
   let matchedSlash = true;
+
+  // eslint-disable-next-line no-plusplus
   for (let i = path.length - 1; i >= 1; --i) {
     code = path.charCodeAt(i);
     if (code === 47) {
@@ -24,4 +26,4 @@ export const dirname = (path) => {
   if (end === -1) return hasRoot ? '/' : '.';
   if (hasRoot && end === 1) return '//';
   return path.slice(0, end);
-}
+};
diff --git a/administrator/components/com_media/resources/scripts/components/app.vue b/administrator/components/com_media/resources/scripts/components/app.vue
index eaf36d36960bb..f4b0fe28a2cf7 100644
--- a/administrator/components/com_media/resources/scripts/components/app.vue
+++ b/administrator/components/com_media/resources/scripts/components/app.vue
@@ -22,8 +22,8 @@
 </template>
 
 <script>
-import * as types from '../store/mutation-types.es6';
-import notifications from '../app/Notifications.es6';
+import * as types from '../store/mutation-types.mjs';
+import notifications from '../app/Notifications.mjs';
 import MediaBrowser from './browser/browser.vue';
 import MediaDisk from './tree/disk.vue';
 import MediaToolbar from './toolbar/toolbar.vue';
diff --git a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue b/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
index 25cddeca8c4e6..f11ee1b5c4f48 100644
--- a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
+++ b/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import navigable from '../../mixins/navigable.es6';
+import navigable from '../../mixins/navigable.mjs';
 
 export default {
   name: 'MediaBreadcrumb',
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue b/administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue
index 50cff7ab76558..7e1f4138523d4 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue
@@ -145,8 +145,8 @@
 </template>
 
 <script>
-import * as types from '../../../store/mutation-types.es6';
-import api from '../../../app/Api.es6';
+import * as types from '../../../store/mutation-types.mjs';
+import api from '../../../app/Api.mjs';
 
 import MediaBrowserActionItemEdit from './edit.vue';
 import MediaBrowserActionItemDelete from './delete.vue';
diff --git a/administrator/components/com_media/resources/scripts/components/browser/browser.vue b/administrator/components/com_media/resources/scripts/components/browser/browser.vue
index c81fb86f3409e..b93e22a600fa2 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/browser.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/browser.vue
@@ -72,9 +72,9 @@
 </template>
 
 <script>
-import * as types from '../../store/mutation-types.es6';
+import * as types from '../../store/mutation-types.mjs';
 import MediaBrowserTable from './table/table.vue';
-import MediaBrowserItem from './items/item.es6';
+import MediaBrowserItem from './items/item.mjs';
 import MediaInfobar from '../infobar/infobar.vue';
 
 function sortArray(array, by, direction) {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
index f78a9b6b47ed6..497f65b4aecef 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
@@ -26,7 +26,7 @@
   </div>
 </template>
 <script>
-import navigable from '../../../mixins/navigable.es6';
+import navigable from '../../../mixins/navigable.mjs';
 import MediaBrowserActionItemsContainer from '../actionItems/actionItemsContainer.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
index f8d1606b22c3a..572dee9b20a0a 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import api from '../../../app/Api.es6';
+import api from '../../../app/Api.mjs';
 import MediaBrowserActionItemsContainer from '../actionItems/actionItemsContainer.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js b/administrator/components/com_media/resources/scripts/components/browser/items/item.mjs
similarity index 98%
rename from administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js
rename to administrator/components/com_media/resources/scripts/components/browser/items/item.mjs
index 9ca4be5a3b7ad..6a5bda79597c7 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js
+++ b/administrator/components/com_media/resources/scripts/components/browser/items/item.mjs
@@ -5,8 +5,8 @@ import Image from './image.vue';
 import Video from './video.vue';
 import Audio from './audio.vue';
 import Doc from './document.vue';
-import * as types from '../../../store/mutation-types.es6';
-import api from '../../../app/Api.es6';
+import * as types from '../../../store/mutation-types.mjs';
+import api from '../../../app/Api.mjs';
 
 export default {
   props: {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/table/row.vue b/administrator/components/com_media/resources/scripts/components/browser/table/row.vue
index d5cc15c1df5d1..4170eb64aab4b 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/table/row.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/table/row.vue
@@ -31,8 +31,8 @@
 </template>
 
 <script>
-import * as types from '../../../store/mutation-types.es6';
-import navigable from '../../../mixins/navigable.es6';
+import * as types from '../../../store/mutation-types.mjs';
+import navigable from '../../../mixins/navigable.mjs';
 
 export default {
   name: 'MediaBrowserItemRow',
diff --git a/administrator/components/com_media/resources/scripts/components/browser/table/table.vue b/administrator/components/com_media/resources/scripts/components/browser/table/table.vue
index 17222e96dfba3..edb9bd67a7e6f 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/table/table.vue
+++ b/administrator/components/com_media/resources/scripts/components/browser/table/table.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script>
-import * as types from '../../../store/mutation-types.es6';
+import * as types from '../../../store/mutation-types.mjs';
 import MediaBrowserItemRow from './row.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue b/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
index fbefb8de2e622..8631b8ba07761 100644
--- a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
+++ b/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
@@ -63,7 +63,7 @@
   </transition>
 </template>
 <script>
-import * as types from '../../store/mutation-types.es6';
+import * as types from '../../store/mutation-types.mjs';
 
 export default {
   name: 'MediaInfobar',
diff --git a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
index ba99879466221..db0c3f2bf07ab 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import * as types from '../../store/mutation-types.es6';
+import * as types from '../../store/mutation-types.mjs';
 import MediaModal from './modal.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
index 99269aa27d795..8e0e995c9d9ca 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import * as types from '../../store/mutation-types.es6';
+import * as types from '../../store/mutation-types.mjs';
 import MediaModal from './modal.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
index 3d21dd94d52ca..c870d580e0a2b 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
@@ -59,8 +59,8 @@
 </template>
 
 <script>
-import api from '../../app/Api.es6';
-import * as types from '../../store/mutation-types.es6';
+import api from '../../app/Api.mjs';
+import * as types from '../../store/mutation-types.mjs';
 import MediaModal from './modal.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
index bdc5e6d12828c..1fec4991f1add 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import * as types from '../../store/mutation-types.es6';
+import * as types from '../../store/mutation-types.mjs';
 import MediaModal from './modal.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
index f0511212afc08..1f0fe07c13287 100644
--- a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
+++ b/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
@@ -74,8 +74,8 @@
 </template>
 
 <script>
-import * as types from '../../store/mutation-types.es6';
-import translate from '../../plugins/translate.es6';
+import * as types from '../../store/mutation-types.mjs';
+import translate from '../../plugins/translate.mjs';
 import MediaModal from './modal.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue b/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
index 963d8f67081f9..df47035c9d74f 100644
--- a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
+++ b/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
@@ -149,7 +149,7 @@
 </template>
 
 <script>
-import * as types from '../../store/mutation-types.es6';
+import * as types from '../../store/mutation-types.mjs';
 import MediaBreadcrumb from '../breadcrumb/breadcrumb.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/tree/drive.vue b/administrator/components/com_media/resources/scripts/components/tree/drive.vue
index e330d003acaee..45f25a7b9985a 100644
--- a/administrator/components/com_media/resources/scripts/components/tree/drive.vue
+++ b/administrator/components/com_media/resources/scripts/components/tree/drive.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import navigable from '../../mixins/navigable.es6';
+import navigable from '../../mixins/navigable.mjs';
 import MediaTree from './tree.vue';
 
 export default {
diff --git a/administrator/components/com_media/resources/scripts/components/tree/tree.vue b/administrator/components/com_media/resources/scripts/components/tree/tree.vue
index 1f14eddff439c..1ff24b7795b2d 100644
--- a/administrator/components/com_media/resources/scripts/components/tree/tree.vue
+++ b/administrator/components/com_media/resources/scripts/components/tree/tree.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import navigable from '../../mixins/navigable.es6';
+import navigable from '../../mixins/navigable.mjs';
 
 export default {
   name: 'MediaTree',
diff --git a/administrator/components/com_media/resources/scripts/mediamanager.es6.js b/administrator/components/com_media/resources/scripts/mediamanager.mjs
similarity index 72%
rename from administrator/components/com_media/resources/scripts/mediamanager.es6.js
rename to administrator/components/com_media/resources/scripts/mediamanager.mjs
index 1efe3523999a8..ba97870d0dddf 100644
--- a/administrator/components/com_media/resources/scripts/mediamanager.es6.js
+++ b/administrator/components/com_media/resources/scripts/mediamanager.mjs
@@ -1,8 +1,8 @@
 import { createApp } from 'vue';
 import App from './components/app.vue';
-import Event from './app/Event.es6';
-import store from './store/store.es6';
-import translate from './plugins/translate.es6';
+import Event from './app/Event.mjs';
+import store from './store/store.mjs';
+import translate from './plugins/translate.mjs';
 
 // Register MediaManager namespace
 window.MediaManager = window.MediaManager || {};
diff --git a/administrator/components/com_media/resources/scripts/mixins/navigable.es6.js b/administrator/components/com_media/resources/scripts/mixins/navigable.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/mixins/navigable.es6.js
rename to administrator/components/com_media/resources/scripts/mixins/navigable.mjs
diff --git a/administrator/components/com_media/resources/scripts/plugins/translate.es6.js b/administrator/components/com_media/resources/scripts/plugins/translate.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/plugins/translate.es6.js
rename to administrator/components/com_media/resources/scripts/plugins/translate.mjs
diff --git a/administrator/components/com_media/resources/scripts/store/actions.es6.js b/administrator/components/com_media/resources/scripts/store/actions.mjs
similarity index 97%
rename from administrator/components/com_media/resources/scripts/store/actions.es6.js
rename to administrator/components/com_media/resources/scripts/store/actions.mjs
index 804ce5e13d617..21da7734e4791 100644
--- a/administrator/components/com_media/resources/scripts/store/actions.es6.js
+++ b/administrator/components/com_media/resources/scripts/store/actions.mjs
@@ -1,7 +1,7 @@
-import api from '../app/Api.es6';
-import * as types from './mutation-types.es6';
-import translate from '../plugins/translate.es6';
-import notifications from '../app/Notifications.es6';
+import api from '../app/Api.mjs';
+import * as types from './mutation-types.mjs';
+import translate from '../plugins/translate.mjs';
+import notifications from '../app/Notifications.mjs';
 
 const updateUrlPath = (path) => {
   const currentPath = path === null ? '' : path;
diff --git a/administrator/components/com_media/resources/scripts/store/getters.es6.js b/administrator/components/com_media/resources/scripts/store/getters.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/getters.es6.js
rename to administrator/components/com_media/resources/scripts/store/getters.mjs
diff --git a/administrator/components/com_media/resources/scripts/store/mutation-types.es6.js b/administrator/components/com_media/resources/scripts/store/mutation-types.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/mutation-types.es6.js
rename to administrator/components/com_media/resources/scripts/store/mutation-types.mjs
diff --git a/administrator/components/com_media/resources/scripts/store/mutations.es6.js b/administrator/components/com_media/resources/scripts/store/mutations.mjs
similarity index 99%
rename from administrator/components/com_media/resources/scripts/store/mutations.es6.js
rename to administrator/components/com_media/resources/scripts/store/mutations.mjs
index b7ab150945132..0e11aebfc214d 100644
--- a/administrator/components/com_media/resources/scripts/store/mutations.es6.js
+++ b/administrator/components/com_media/resources/scripts/store/mutations.mjs
@@ -1,5 +1,5 @@
-import * as types from './mutation-types.es6';
-import { dirname } from '../app/path';
+import * as types from './mutation-types.mjs';
+import { dirname } from '../app/path.mjs';
 
 // The only way to actually change state in a store is by committing a mutation.
 // Mutations are very similar to events: each mutation has a string type and a handler.
diff --git a/administrator/components/com_media/resources/scripts/store/plugins/persisted-state.es6.js b/administrator/components/com_media/resources/scripts/store/plugins/persisted-state.mjs
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/plugins/persisted-state.es6.js
rename to administrator/components/com_media/resources/scripts/store/plugins/persisted-state.mjs
diff --git a/administrator/components/com_media/resources/scripts/store/state.es6.js b/administrator/components/com_media/resources/scripts/store/state.mjs
similarity index 98%
rename from administrator/components/com_media/resources/scripts/store/state.es6.js
rename to administrator/components/com_media/resources/scripts/store/state.mjs
index 8cb71276175c6..dc07738369ed8 100644
--- a/administrator/components/com_media/resources/scripts/store/state.es6.js
+++ b/administrator/components/com_media/resources/scripts/store/state.mjs
@@ -1,4 +1,4 @@
-import persistedStateOptions from './plugins/persisted-state.es6';
+import persistedStateOptions from './plugins/persisted-state.mjs';
 
 // Get the disks from joomla option storage
 const options = Joomla.getOptions('com_media', {});
diff --git a/administrator/components/com_media/resources/scripts/store/store.es6.js b/administrator/components/com_media/resources/scripts/store/store.mjs
similarity index 61%
rename from administrator/components/com_media/resources/scripts/store/store.es6.js
rename to administrator/components/com_media/resources/scripts/store/store.mjs
index 6d704b4614162..71a0c480b288f 100644
--- a/administrator/components/com_media/resources/scripts/store/store.es6.js
+++ b/administrator/components/com_media/resources/scripts/store/store.mjs
@@ -1,10 +1,10 @@
 import { createStore } from 'vuex';
 import VuexPersistence from 'vuex-persist';
-import state from './state.es6';
-import * as getters from './getters.es6';
-import * as actions from './actions.es6';
-import mutations from './mutations.es6';
-import persistedStateOptions from './plugins/persisted-state.es6.js';
+import state from './state.mjs';
+import * as getters from './getters.mjs';
+import * as actions from './actions.mjs';
+import mutations from './mutations.mjs';
+import persistedStateOptions from './plugins/persisted-state.mjs';
 // A Vuex instance is created by combining the state, mutations, actions, and getters.
 export default createStore({
   state,
diff --git a/build/.eslintrc b/build/.eslintrc
index 24f5eac974cce..b6812df81f2f4 100644
--- a/build/.eslintrc
+++ b/build/.eslintrc
@@ -19,7 +19,7 @@
   // Additional global variables your script accesses during execution
   "globals": {
     "Joomla": true,
-    "MediaManager" : true,
+    "MediaManager": true,
     "bootstrap": true
   },
   // Rule overrides
@@ -27,7 +27,7 @@
     // Disable no-params-reassign for properties
     "no-param-reassign": ["error", { "props": false }],
     // Allow usage of dev-dependencies in js files in build directory
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["build/**/*.js"]}],
+    "import/no-extraneous-dependencies": ["error", {"devDependencies": ["build/**/*.mjs", "cypress.config.dist.mjs", "**/**/cypress.config.mjs"]}],
     // Allow strict mode (we are not dealing with modules)
     "strict": [0],
     // Disable alert rule till we have a CE in place
@@ -49,27 +49,28 @@
     "func-names": [
       "error",
       "as-needed"
-    ]
+    ],
+    "import/prefer-default-export": 0
   },
   "overrides": [
-	{
-	  "files": ["tests/**/*.js"],
-	  "rules": {
-		"no-undef": ["off"],
-		"import/no-extraneous-dependencies": ["off"]
-	  }
-	},
-	{
-	  "files": ["tests/System/support/index.js"],
-	  "rules": {
-		"no-console": ["off"]
-	  }
-	},
-	{
-	  "files": ["tests/System/support/commands/db.js","tests/System/plugins/index.js"],
-	  "rules": {
-		"no-useless-escape": ["off"]
-	  }
-	}
+    {
+      "files": ["tests/**/*.js", "tests/**/*.mjs"],
+      "rules": {
+        "no-undef": ["off"],
+        "import/no-extraneous-dependencies": ["off"]
+      }
+    },
+    {
+      "files": ["tests/System/support/index.js"],
+      "rules": {
+        "no-console": ["off"]
+      }
+    },
+    {
+      "files": ["tests/System/support/commands/db.mjs"],
+      "rules": {
+        "no-useless-escape": ["off"]
+      }
+    }
   ]
 }
diff --git a/build/README.md b/build/README.md
index 96d724ffbdcb1..73dd5aa7ff309 100644
--- a/build/README.md
+++ b/build/README.md
@@ -5,6 +5,8 @@ Joomla provides a set of tools for managing static assets and dependencies based
 ## Node Based Tools
 The responsibilities of these tools are:
 - To copy files from the `node-modules` folder to the `media` folder.
+- The configuration for the localization of any node packages is held inside the `package.json` on the root folder under the key `settings`.
+- Build the static error pages (settings are in `package.json`).
 - Do any transformations on the copied files.
 - Update the version numbers on the XML files of the TinyMCE and CodeMirror editors.
 - Copy files from the `build/media_source` folder to the `media` folder.
@@ -15,15 +17,12 @@ For some of these operations, conventions were established to simplify and speed
 
 ## Javascript
 There are three options here:
-- Modern Javascript files must have an extension `.es6.js`.
+- Modern Javascript files must have an extension `.mjs`.
+  Filenames starting with `_` will not become entry points for module bundling.
   This allows ESLint to check the code style, Joomla is using the Airbnb preset https://github.com/airbnb/javascript.
   It also instructs Rollup to do the transforms for ES2017 and then transpile to ES5. This step creates both normal and minified files.
   Production code WILL NOT have the `.es6` part for ES2017+ files but WILL HAVE a `-es5.js` for the ES5 ones.
 
-- Web Component Javascript files must have an extension `.w-c.es6.js`.
-  This allows ESLint to check the code style and instructs Rollup to do the transforms for ES2017 and then transpile to ES5. This step creates normal and minified files. The difference with the `.es6` files is that the tools will automate the minification of the CSS (assuming that the appropriate SCSS file exists), which is then injected into the JS file in place of the placeholder `{{CSS_CONTENTS_PLACEHOLDER}}` (ie: `build/media_source/system/js/joomla-core-loader.w-c.es6.js`)
-  Production code WILL NOT have the `.w-c.es6` part for ES2017+ files but WILL HAVE a `-es5.js` for the ES5 ones.
-
 - Legacy Javascript files must have an extension `.es5.js`.
   This instructs ESLint to skip checking this file.
   Also, it instructs the tools to create a minified version (production code WILL NOT have the `.es5` part)
diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.mjs
similarity index 88%
rename from build/build-modules-js/compilecss.es6.js
rename to build/build-modules-js/compilecss.mjs
index 6e7d3458a97cb..fc2d93a1a6f29 100644
--- a/build/build-modules-js/compilecss.es6.js
+++ b/build/build-modules-js/compilecss.mjs
@@ -1,8 +1,10 @@
-const { stat } = require('fs-extra');
-const { sep } = require('path');
-const recursive = require('recursive-readdir');
-const { handleScssFile } = require('./stylesheets/handle-scss.es6.js');
-const { handleCssFile } = require('./stylesheets/handle-css.es6.js');
+import { sep } from 'node:path';
+import recursive from 'recursive-readdir';
+import pkg from 'fs-extra';
+import { handleScssFile } from './stylesheets/handle-scss.mjs';
+import { handleCssFile } from './stylesheets/handle-css.mjs';
+
+const { stat } = pkg;
 
 const RootPath = process.cwd();
 
@@ -19,7 +21,7 @@ const RootPath = process.cwd();
  * @param {object} options  The options
  * @param {string} path     The folder that needs to be compiled, optional
  */
-module.exports.stylesheets = async (options, path) => {
+const stylesheets = async (options, path) => {
   const files = [];
   let folders = [];
 
@@ -86,3 +88,5 @@ module.exports.stylesheets = async (options, path) => {
 
   return Promise.all([...cssFilesPromises, ...scssFilesPromises]);
 };
+
+export default stylesheets;
diff --git a/build/build-modules-js/compilejs.es6.js b/build/build-modules-js/compilejs.mjs
similarity index 73%
rename from build/build-modules-js/compilejs.es6.js
rename to build/build-modules-js/compilejs.mjs
index e837d5d0a21a9..fc953ef687f8b 100644
--- a/build/build-modules-js/compilejs.es6.js
+++ b/build/build-modules-js/compilejs.mjs
@@ -1,8 +1,8 @@
-const { stat } = require('fs-extra');
-const { sep } = require('path');
-const recursive = require('recursive-readdir');
-const { handleES5File } = require('./javascript/handle-es5.es6.js');
-const { handleESMFile } = require('./javascript/compile-to-es2017.es6.js');
+import { stat } from 'node:fs';
+import { sep } from 'node:path';
+import recursive from 'recursive-readdir';
+import { handleES5File } from './javascript/handle-es5.mjs';
+import { handleESMFile } from './javascript/compile-to-es2017.mjs';
 
 const RootPath = process.cwd();
 
@@ -13,15 +13,13 @@ const RootPath = process.cwd();
  * minify them in place
  * compile any custom elements/webcomponents
  *
- * Expects ES6 files to have ext: .es6.js
+ * Expects ESM files to have ext: .mjs
  *         ES5 files to have ext: .es5.js
- *         WC/CE files to have ext: .w-c.es6.js
  *
  * @param { object } options The options from settings.json
  * @param { string } path    The folder that needs to be compiled, optional
- * @param { string } mode    esm for ES2017, es5 for ES5, both for both
  */
-module.exports.scripts = async (options, path) => {
+const scripts = async (options, path) => {
   const files = [];
   let folders = [];
 
@@ -49,7 +47,7 @@ module.exports.scripts = async (options, path) => {
   // Loop to get the files that should be compiled via parameter
   // eslint-disable-next-line no-restricted-syntax
   for (const folder of folders) {
-    folderPromises.push(recursive(folder, ['!*.+(js)']));
+    folderPromises.push(recursive(folder, ['!*.+(m|js)']));
   }
 
   const computedFiles = await Promise.all(folderPromises);
@@ -65,10 +63,12 @@ module.exports.scripts = async (options, path) => {
 
     if (file.match(/\.es5\.js$/)) {
       jsFilesPromises.push(handleES5File(file));
-    } else if (file.match(/\.es6\.js$/) || file.match(/\.w-c\.es6\.js$/)) {
+    } else if (file.endsWith('.mjs') && !file.startsWith('_')) {
       esmFilesPromises.push(handleESMFile(file));
     }
   });
 
   Promise.all([...jsFilesPromises, ...esmFilesPromises]);
 };
+
+export default scripts;
diff --git a/build/build-modules-js/compress.es6.js b/build/build-modules-js/compress.mjs
similarity index 72%
rename from build/build-modules-js/compress.es6.js
rename to build/build-modules-js/compress.mjs
index 5a8d7909ba074..26110e4840395 100644
--- a/build/build-modules-js/compress.es6.js
+++ b/build/build-modules-js/compress.mjs
@@ -1,12 +1,12 @@
-const { getFiles } = require('@dgrammatiko/compress/src/getFiles.js');
-const { compressFile } = require('@dgrammatiko/compress/src/compressFile.js');
-const { Timer } = require('./utils/timer.es6.js');
+import { getFiles } from '@dgrammatiko/compress/src/getFiles.js';
+import { compressFile } from '@dgrammatiko/compress/src/compressFile.js';
+import { Timer } from './utils/timer.mjs';
 
 /**
  * Method that will pre compress (gzip) all .css/.js files
  * in the templates and in the media folder
  */
-module.exports.compressFiles = async (enableBrotli = false) => {
+export const compressFiles = async (enableBrotli = false) => {
   const bench = new Timer('Gzip');
   const paths = [
     `${process.cwd()}/media`,
diff --git a/build/build-modules-js/error-pages.es6.js b/build/build-modules-js/error-pages.mjs
similarity index 94%
rename from build/build-modules-js/error-pages.es6.js
rename to build/build-modules-js/error-pages.mjs
index b90878b3b882e..81f41dc232f61 100644
--- a/build/build-modules-js/error-pages.es6.js
+++ b/build/build-modules-js/error-pages.mjs
@@ -1,11 +1,11 @@
-const {
+import {
   access, mkdir, readFile, writeFile,
-} = require('fs').promises;
-const Ini = require('ini');
-const { dirname } = require('path');
-const Recurs = require('recursive-readdir');
-const { transform } = require('esbuild');
-const LightningCSS = require('lightningcss');
+} from 'node:fs/promises';
+import Ini from 'ini';
+import { dirname } from 'node:path';
+import Recurs from 'recursive-readdir';
+import { transform } from 'esbuild';
+import { transform as transformCss } from 'lightningcss';
 
 const RootPath = process.cwd();
 const dir = `${RootPath}/installation/language`;
@@ -21,7 +21,7 @@ const srcPath = `${RootPath}/build/warning_page`;
  * And also specific strings in the languages in the installation folder!
  * Also the base strings are held in build/build-modules-js/settings.json
  */
-module.exports.createErrorPages = async (options) => {
+async function createErrorPages(options) {
   const iniFilesProcess = [];
   const processPages = [];
   global.incompleteObj = {};
@@ -33,7 +33,7 @@ module.exports.createErrorPages = async (options) => {
   let cssContent = await readFile(`${srcPath}/template.css`, { encoding: 'utf8' });
   let jsContent = await readFile(`${srcPath}/template.js`, { encoding: 'utf8' });
 
-  const { code } = LightningCSS.transform({
+  const { code } = transformCss({
     code: Buffer.from(cssContent),
     minify: true,
   });
@@ -165,4 +165,6 @@ module.exports.createErrorPages = async (options) => {
     console.error(err);
     process.exitCode = -1;
   });
-};
+}
+
+export default createErrorPages;
diff --git a/build/build-modules-js/init/cleanup-media.es6.js b/build/build-modules-js/init/cleanup-media.mjs
similarity index 91%
rename from build/build-modules-js/init/cleanup-media.es6.js
rename to build/build-modules-js/init/cleanup-media.mjs
index 76f741892b3a0..b0a56f645d684 100644
--- a/build/build-modules-js/init/cleanup-media.es6.js
+++ b/build/build-modules-js/init/cleanup-media.mjs
@@ -1,7 +1,10 @@
+import { join } from 'node:path';
+
+import pkg from 'fs-extra';
+
 const {
-  stat, mkdir, copy, remove,
-} = require('fs-extra');
-const { join } = require('path');
+  copy, remove, stat, mkdir,
+} = pkg;
 
 const RootPath = process.cwd();
 
@@ -11,7 +14,7 @@ const RootPath = process.cwd();
  *
  * @returns {Promise}
  */
-module.exports.cleanVendors = async () => {
+export const cleanVendors = async () => {
   if (process.env.SKIP_COMPOSER_CHECK === 'YES') {
     await mkdir('media/vendor/debugbar', { recursive: true, mode: 0o755 });
     // eslint-disable-next-line no-console
diff --git a/build/build-modules-js/init/common/concat-files.es6.js b/build/build-modules-js/init/common/concat-files.mjs
similarity index 82%
rename from build/build-modules-js/init/common/concat-files.es6.js
rename to build/build-modules-js/init/common/concat-files.mjs
index 071cfff298fc6..0bc79f2e0dccc 100644
--- a/build/build-modules-js/init/common/concat-files.es6.js
+++ b/build/build-modules-js/init/common/concat-files.mjs
@@ -1,4 +1,6 @@
-const { readFile, writeFile, existsSync } = require('fs-extra');
+import pkg from 'fs-extra';
+
+const { readFile, writeFile, existsSync } = pkg;
 
 const RootPath = process.cwd();
 
@@ -10,7 +12,7 @@ const RootPath = process.cwd();
  *
  * @returns {void}
  */
-module.exports.concatFiles = async (files, output) => {
+export const concatFiles = async (files, output) => {
   const promises = [];
 
   // eslint-disable-next-line no-restricted-syntax
diff --git a/build/build-modules-js/init/common/copy-all-files.es6.js b/build/build-modules-js/init/common/copy-all-files.mjs
similarity index 80%
rename from build/build-modules-js/init/common/copy-all-files.es6.js
rename to build/build-modules-js/init/common/copy-all-files.mjs
index 9802a382ca406..056246771dc94 100644
--- a/build/build-modules-js/init/common/copy-all-files.es6.js
+++ b/build/build-modules-js/init/common/copy-all-files.mjs
@@ -1,5 +1,5 @@
-const { copy } = require('fs-extra');
-const { join } = require('path');
+import { join } from 'node:path';
+import { copy } from 'fs-extra';
 
 const RootPath = process.cwd();
 
@@ -12,7 +12,7 @@ const RootPath = process.cwd();
  *
  * @returns { void }
  */
-module.exports.copyAllFiles = async (dirName, name, type) => {
+export const copyAllFiles = async (dirName, name, type) => {
   const folderName = dirName === '/' ? '/' : `/${dirName}`;
   await copy(
     join(RootPath, `node_modules/${name}/${folderName}`),
diff --git a/build/build-modules-js/init/exemptions/codemirror.es6.js b/build/build-modules-js/init/exemptions/codemirror.mjs
similarity index 91%
rename from build/build-modules-js/init/exemptions/codemirror.es6.js
rename to build/build-modules-js/init/exemptions/codemirror.mjs
index 1040c51a51a64..275dc049117a4 100644
--- a/build/build-modules-js/init/exemptions/codemirror.es6.js
+++ b/build/build-modules-js/init/exemptions/codemirror.mjs
@@ -1,10 +1,12 @@
+import { join } from 'node:path';
+import pkg from 'fs-extra';
+
+import { concatFiles } from '../common/concat-files.mjs';
+import { copyAllFiles } from '../common/copy-all-files.mjs';
+
 const {
   existsSync, readFile, writeFile, mkdir,
-} = require('fs-extra');
-const { join } = require('path');
-
-const { concatFiles } = require('../common/concat-files.es6.js');
-const { copyAllFiles } = require('../common/copy-all-files.es6.js');
+} = pkg;
 
 const RootPath = process.cwd();
 const xmlVersionStr = /(<version>)(.+)(<\/version>)/;
@@ -12,7 +14,7 @@ const xmlVersionStr = /(<version>)(.+)(<\/version>)/;
 /**
  * Codemirror needs special treatment
  */
-module.exports.codeMirror = async (packageName, version) => {
+const codeMirror = async (packageName, version) => {
   const itemvendorPath = join(RootPath, `media/vendor/${packageName}`);
   if (!await existsSync(itemvendorPath)) {
     await mkdir(itemvendorPath, { recursive: true, mode: 0o755 });
@@ -70,3 +72,5 @@ module.exports.codeMirror = async (packageName, version) => {
   codemirrorXml = codemirrorXml.replace(xmlVersionStr, `$1${version}$3`);
   await writeFile(`${RootPath}/plugins/editors/codemirror/codemirror.xml`, codemirrorXml, { encoding: 'utf8', mode: 0o644 });
 };
+
+export { codeMirror };
diff --git a/build/build-modules-js/init/exemptions/tinymce.es6.js b/build/build-modules-js/init/exemptions/tinymce.mjs
similarity index 89%
rename from build/build-modules-js/init/exemptions/tinymce.es6.js
rename to build/build-modules-js/init/exemptions/tinymce.mjs
index 251a4220beca6..2672a84f6cd5c 100644
--- a/build/build-modules-js/init/exemptions/tinymce.es6.js
+++ b/build/build-modules-js/init/exemptions/tinymce.mjs
@@ -1,12 +1,12 @@
-const {
-  existsSync, copy, readFile, writeFile, mkdir,
-} = require('fs-extra');
-const LightningCSS = require('lightningcss');
-const { transform } = require('esbuild');
-
-const { join } = require('path');
+import { join } from 'node:path';
+import { transform as transfromCss } from 'lightningcss';
+import { transform } from 'esbuild';
+import pkg from 'fs-extra';
+import { copyAllFiles } from '../common/copy-all-files.mjs';
 
-const { copyAllFiles } = require('../common/copy-all-files.es6.js');
+const {
+  copy, existsSync, readFile, writeFile, mkdir,
+} = pkg;
 
 const RootPath = process.cwd();
 const xmlVersionStr = /(<version>)(.+)(<\/version>)/;
@@ -38,7 +38,7 @@ const copyArrayFiles = async (dirName, files, name, type) => {
 /**
  * tinyMCE needs special treatment
  */
-module.exports.tinyMCE = async (packageName, version) => {
+export const tinyMCE = async (packageName, version) => {
   const itemvendorPath = join(RootPath, `media/vendor/${packageName}`);
 
   if (!await existsSync(itemvendorPath)) {
@@ -71,12 +71,12 @@ module.exports.tinyMCE = async (packageName, version) => {
   /* Create the Highlighter plugin */
   // Get the css
   let cssContent = await readFile('build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.css', { encoding: 'utf8' });
-  cssContent = LightningCSS.transform({
+  cssContent = transfromCss({
     code: Buffer.from(cssContent),
     minify: true,
   }).code;
   // Get the JS
-  let jsContent = await readFile('build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js', { encoding: 'utf8' });
+  let jsContent = await readFile('build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.mjs', { encoding: 'utf8' });
   jsContent = await transform(jsContent, { minify: true });
   // Write the HTML file
   const htmlContent = `<!DOCTYPE html>
diff --git a/build/build-modules-js/init/localise-packages.es6.js b/build/build-modules-js/init/localise-packages.mjs
similarity index 68%
rename from build/build-modules-js/init/localise-packages.es6.js
rename to build/build-modules-js/init/localise-packages.mjs
index 8133a6c5c090d..e45299f0af490 100644
--- a/build/build-modules-js/init/localise-packages.es6.js
+++ b/build/build-modules-js/init/localise-packages.mjs
@@ -1,9 +1,15 @@
+import { createRequire } from 'node:module';
+
+import { dirname, join } from 'node:path';
+import { existsSync } from 'node:fs';
+import pkg from 'fs-extra';
+import { codeMirror } from './exemptions/codemirror.mjs';
+import { tinyMCE } from './exemptions/tinymce.mjs';
+
+const require = createRequire(import.meta.url);
 const {
-  existsSync, copy, writeFile, mkdir, mkdirs, ensureDir,
-} = require('fs-extra');
-const { dirname, join } = require('path');
-const { codeMirror } = require('./exemptions/codemirror.es6.js');
-const { tinyMCE } = require('./exemptions/tinymce.es6.js');
+  copy, mkdirs, mkdir, ensureDir, writeFile,
+} = pkg;
 
 const RootPath = process.cwd();
 
@@ -26,7 +32,9 @@ const copyFilesTo = async (files, srcDir, destDir) => {
   // Copy each file
   // eslint-disable-next-line no-restricted-syntax,guard-for-in
   for (const srcFile in files) {
-    copyPromises.push(doTheCopy(join(srcDir, srcFile), join(destDir, files[srcFile])));
+    copyPromises.push(
+      doTheCopy(join(srcDir, srcFile), join(destDir, files[srcFile])),
+    );
   }
 
   return Promise.all(copyPromises);
@@ -37,7 +45,13 @@ const copyFilesTo = async (files, srcDir, destDir) => {
  *
  * @returns {Promise}
  */
-const resolvePackage = async (vendor, packageName, mediaVendorPath, options, registry) => {
+const resolvePackage = async (
+  vendor,
+  packageName,
+  mediaVendorPath,
+  options,
+  registry,
+) => {
   const vendorName = vendor.name || packageName;
   const modulePathJson = require.resolve(`${packageName}/package.json`);
   const modulePathRoot = dirname(modulePathJson);
@@ -57,18 +71,30 @@ const resolvePackage = async (vendor, packageName, mediaVendorPath, options, reg
       if (!vendor[type]) return;
 
       promises.push(
-        copyFilesTo(vendor[type], modulePathRoot, join(mediaVendorPath, vendorName), type),
+        copyFilesTo(
+          vendor[type],
+          modulePathRoot,
+          join(mediaVendorPath, vendorName),
+          type,
+        ),
       );
     });
   }
 
   // Copy the license if existsSync
-  if (options.settings.vendors[packageName].licenseFilename
-  && await existsSync(`${join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`)
+  if (
+    options.settings.vendors[packageName].licenseFilename
+    && (await existsSync(
+      `${join(RootPath, `node_modules/${packageName}`)}/${
+        options.settings.vendors[packageName].licenseFilename
+      }`,
+    ))
   ) {
     const dest = join(mediaVendorPath, vendorName);
     await copy(
-      `${join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`,
+      `${join(RootPath, `node_modules/${packageName}`)}/${
+        options.settings.vendors[packageName].licenseFilename
+      }`,
       `${dest}/${options.settings.vendors[packageName].licenseFilename}`,
       { preserveTimestamps: true },
     );
@@ -89,11 +115,20 @@ const resolvePackage = async (vendor, packageName, mediaVendorPath, options, reg
       const registryItem = Object.assign(assetInfo, registryItemBase);
 
       // Update path to file
-      if (assetInfo.uri && (assetInfo.type === 'script' || assetInfo.type === 'style' || assetInfo.type === 'webcomponent')) {
+      if (
+        assetInfo.uri
+        && (assetInfo.type === 'script'
+          || assetInfo.type === 'style'
+          || assetInfo.type === 'webcomponent')
+      ) {
         let itemPath = assetInfo.uri;
 
         // Check for external path
-        if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
+        if (
+          itemPath.indexOf('http://') !== 0
+          && itemPath.indexOf('https://') !== 0
+          && itemPath.indexOf('//') !== 0
+        ) {
           itemPath = `vendor/${vendorName}/${itemPath}`;
         }
 
@@ -115,7 +150,7 @@ const resolvePackage = async (vendor, packageName, mediaVendorPath, options, reg
  *
  * @returns {Promise}
  */
-module.exports.localisePackages = async (options) => {
+export const localisePackages = async (options) => {
   const mediaVendorPath = join(RootPath, 'media/vendor');
   const registry = {
     $schema: 'https://developer.joomla.org/schemas/json-schema/web_assets.json',
@@ -127,7 +162,7 @@ module.exports.localisePackages = async (options) => {
   };
   const promises = [];
 
-  if (!await existsSync(mediaVendorPath)) {
+  if (!(await existsSync(mediaVendorPath))) {
     await mkdir(mediaVendorPath, { recursive: true, mode: 0o755 });
   }
 
@@ -136,7 +171,9 @@ module.exports.localisePackages = async (options) => {
   for (const packageName in options.settings.vendors) {
     const vendor = options.settings.vendors[packageName];
 
-    promises.push(resolvePackage(vendor, packageName, mediaVendorPath, options, registry));
+    promises.push(
+      resolvePackage(vendor, packageName, mediaVendorPath, options, registry),
+    );
   }
 
   await Promise.all(promises);
diff --git a/build/build-modules-js/init/minify-vendor.es6.js b/build/build-modules-js/init/minify-vendor.mjs
similarity index 90%
rename from build/build-modules-js/init/minify-vendor.es6.js
rename to build/build-modules-js/init/minify-vendor.mjs
index ab64b5fb67918..3df22d5d840ca 100644
--- a/build/build-modules-js/init/minify-vendor.es6.js
+++ b/build/build-modules-js/init/minify-vendor.mjs
@@ -1,7 +1,7 @@
-const { lstat, readFile, writeFile } = require('fs-extra');
-const { sep, basename } = require('path');
-const recursive = require('recursive-readdir');
-const { transform } = require('esbuild');
+import { sep, basename } from 'node:path';
+import { lstat, readFile, writeFile } from 'node:fs';
+import recursive from 'recursive-readdir';
+import { transform } from 'esbuild';
 
 const RootPath = process.cwd();
 
@@ -86,7 +86,7 @@ const minifyJS = async (file) => {
  *
  * @returns {Promise}
  */
-module.exports.minifyVendor = async () => {
+export const minifyVendor = async () => {
   const folderPromises = [];
   const filesPromises = [];
 
diff --git a/build/build-modules-js/init/patches.es6.js b/build/build-modules-js/init/patches.mjs
similarity index 95%
rename from build/build-modules-js/init/patches.es6.js
rename to build/build-modules-js/init/patches.mjs
index 99dfe6937e236..f57da78084d90 100644
--- a/build/build-modules-js/init/patches.es6.js
+++ b/build/build-modules-js/init/patches.mjs
@@ -1,6 +1,7 @@
-const { readFile, writeFile } = require('fs-extra');
-const { join } = require('path');
+import { join } from 'node:path';
+import pkg from 'fs-extra';
 
+const { readFile, writeFile } = pkg;
 const RootPath = process.cwd();
 
 /**
@@ -10,7 +11,7 @@ const RootPath = process.cwd();
  *
  * @returns {Promise}
  */
-module.exports.patchPackages = async (options) => {
+export const patchPackages = async (options) => {
   const mediaVendorPath = join(RootPath, 'media/vendor');
 
   // Joomla's hack to expose the chosen base classes so we can extend it ourselves
diff --git a/build/build-modules-js/init/recreate-media.es6.js b/build/build-modules-js/init/recreate-media.mjs
similarity index 85%
rename from build/build-modules-js/init/recreate-media.es6.js
rename to build/build-modules-js/init/recreate-media.mjs
index a0f8989421446..81c46cf725b4b 100644
--- a/build/build-modules-js/init/recreate-media.es6.js
+++ b/build/build-modules-js/init/recreate-media.mjs
@@ -1,11 +1,11 @@
-const {
-  stat, copy, existsSync, emptyDirSync,
-} = require('fs-extra');
-const {
-  readFile, writeFile, readdir,
-} = require('fs').promises;
-const { join, extname } = require('path');
-const recursive = require('recursive-readdir');
+import { join, extname } from 'node:path';
+import { readFile, writeFile, readdir } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import recursive from 'recursive-readdir';
+
+import pkg from 'fs-extra';
+
+const { copy, emptyDirSync, stat } = pkg;
 
 const RootPath = process.cwd();
 const knownDirs = [
@@ -32,7 +32,7 @@ const updateSettings = async (options) => {
  *
  * @returns {Promise}
  */
-module.exports.recreateMediaFolder = async (options) => {
+const recreateMediaFolder = async (options) => {
   await updateSettings(options);
   const installedVendors = Object.keys(options.settings.vendors).map((vendor) => {
     if (vendor === 'choices.js') {
@@ -66,7 +66,7 @@ module.exports.recreateMediaFolder = async (options) => {
 
   const filterFunc = async (src) => {
     const fileStat = await stat(src);
-    if (fileStat.isFile() && (extname(src) === '.js' || extname(src) === '.css')) {
+    if (fileStat.isFile() && ['.js', '.mjs', '.css'].includes(extname(src))) {
       return false;
     }
 
@@ -84,3 +84,5 @@ module.exports.recreateMediaFolder = async (options) => {
     await writeFile(SCSSMediafolders[file], contents.replace(/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/media\//g, '../../../../'));
   });
 };
+
+export default recreateMediaFolder;
diff --git a/build/build-modules-js/javascript/build-bootstrap-js.es6.js b/build/build-modules-js/javascript/build-bootstrap-js.mjs
similarity index 77%
rename from build/build-modules-js/javascript/build-bootstrap-js.es6.js
rename to build/build-modules-js/javascript/build-bootstrap-js.mjs
index 365ae3e5cea25..f7f6f77057fe4 100644
--- a/build/build-modules-js/javascript/build-bootstrap-js.es6.js
+++ b/build/build-modules-js/javascript/build-bootstrap-js.mjs
@@ -1,15 +1,20 @@
-const {
+import {
   readdir, readFile, writeFile, unlink,
-} = require('fs').promises;
-const { resolve } = require('path');
-const { transform } = require('esbuild');
-const rimraf = require('rimraf');
-const rollup = require('rollup');
-const { nodeResolve } = require('@rollup/plugin-node-resolve');
-const replace = require('@rollup/plugin-replace');
-const { babel } = require('@rollup/plugin-babel');
-const commonjs = require('@rollup/plugin-commonjs');
-const bsVersion = require('../../../package.json').dependencies.bootstrap.replace(/^\^|~/, '');
+} from 'node:fs/promises';
+import { resolve } from 'node:path';
+import { createRequire } from 'node:module';
+import { transform } from 'esbuild';
+import rimraf from 'rimraf';
+import { rollup } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import replace from '@rollup/plugin-replace';
+import { babel } from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
+
+const require = createRequire(import.meta.url);
+const opts = require('../../../package.json');
+
+const bsVersion = opts.dependencies.bootstrap.replace(/^\^|~/, '');
 
 const tasks = [];
 const inputFolder = 'build/media_source/vendor/bootstrap/js';
@@ -29,8 +34,8 @@ const build = async () => {
   const domImports = await readdir(resolve('node_modules/bootstrap', 'js/src/dom'));
   const utilImports = await readdir(resolve('node_modules/bootstrap', 'js/src/util'));
 
-  const bundle = await rollup.rollup({
-    input: resolve(inputFolder, 'index.es6.js'),
+  const bundle = await rollup({
+    input: resolve(inputFolder, 'index.mjs'),
     plugins: [
       nodeResolve(),
       replace({
@@ -58,17 +63,17 @@ const build = async () => {
       }),
     ],
     manualChunks: {
-      alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'],
-      button: ['build/media_source/vendor/bootstrap/js/button.es6.js'],
-      carousel: ['build/media_source/vendor/bootstrap/js/carousel.es6.js'],
-      collapse: ['build/media_source/vendor/bootstrap/js/collapse.es6.js'],
-      dropdown: ['build/media_source/vendor/bootstrap/js/dropdown.es6.js'],
-      modal: ['build/media_source/vendor/bootstrap/js/modal.es6.js'],
-      offcanvas: ['build/media_source/vendor/bootstrap/js/offcanvas.es6.js'],
-      popover: ['build/media_source/vendor/bootstrap/js/popover.es6.js'],
-      scrollspy: ['build/media_source/vendor/bootstrap/js/scrollspy.es6.js'],
-      tab: ['build/media_source/vendor/bootstrap/js/tab.es6.js'],
-      toast: ['build/media_source/vendor/bootstrap/js/toast.es6.js'],
+      alert: ['build/media_source/vendor/bootstrap/js/alert.mjs'],
+      button: ['build/media_source/vendor/bootstrap/js/button.mjs'],
+      carousel: ['build/media_source/vendor/bootstrap/js/carousel.mjs'],
+      collapse: ['build/media_source/vendor/bootstrap/js/collapse.mjs'],
+      dropdown: ['build/media_source/vendor/bootstrap/js/dropdown.mjs'],
+      modal: ['build/media_source/vendor/bootstrap/js/modal.mjs'],
+      offcanvas: ['build/media_source/vendor/bootstrap/js/offcanvas.mjs'],
+      popover: ['build/media_source/vendor/bootstrap/js/popover.mjs'],
+      scrollspy: ['build/media_source/vendor/bootstrap/js/scrollspy.mjs'],
+      tab: ['build/media_source/vendor/bootstrap/js/tab.mjs'],
+      toast: ['build/media_source/vendor/bootstrap/js/toast.mjs'],
       popper: ['@popperjs/core'],
       dom: [
         'node_modules/bootstrap/js/src/base-component.js',
@@ -93,8 +98,8 @@ const buildLegacy = async () => {
   // eslint-disable-next-line no-console
   console.log('Building Legacy...');
 
-  const bundle = await rollup.rollup({
-    input: resolve(inputFolder, 'index.es6.js'),
+  const bundle = await rollup({
+    input: resolve(inputFolder, 'index.mjs'),
     plugins: [
       commonjs(),
       nodeResolve(),
@@ -138,12 +143,12 @@ const buildLegacy = async () => {
   await bundle.close();
 };
 
-module.exports.bootstrapJs = async () => {
+export const bootstrapJs = async () => {
   rimraf.sync(resolve(outputFolder));
 
   try {
-    await build(resolve(inputFolder, 'index.es6.js'));
-    await unlink(resolve(outputFolder, 'index.es6.js'));
+    await build(resolve(inputFolder, 'index.mjs'));
+    await unlink(resolve(outputFolder, 'index.js'));
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error(error);
@@ -159,7 +164,7 @@ module.exports.bootstrapJs = async () => {
     console.log('✅ ES6 components ready');
 
     try {
-      await buildLegacy(inputFolder, 'index.es6.js');
+      await buildLegacy(inputFolder, 'index.mjs');
       const es5File = await readFile(resolve(outputFolder, 'bootstrap-es5.js'), { encoding: 'utf8' });
       const mini = await transform(es5File, { minify: true });
       await writeFile(resolve(outputFolder, 'bootstrap-es5.min.js'), mini.code, { encoding: 'utf8', mode: 0o644 });
diff --git a/build/build-modules-js/javascript/build-com_media-js.es6.js b/build/build-modules-js/javascript/build-com_media-js.mjs
similarity index 86%
rename from build/build-modules-js/javascript/build-com_media-js.es6.js
rename to build/build-modules-js/javascript/build-com_media-js.mjs
index 998e37c18fe9b..c73a7238ceaf1 100644
--- a/build/build-modules-js/javascript/build-com_media-js.es6.js
+++ b/build/build-modules-js/javascript/build-com_media-js.mjs
@@ -1,23 +1,25 @@
-const { resolve } = require('path');
-const { writeFile, copyFile, rm } = require('fs').promises;
-const { existsSync } = require('fs');
-const rollup = require('rollup');
-const { nodeResolve } = require('@rollup/plugin-node-resolve');
-const replace = require('@rollup/plugin-replace');
-const { babel } = require('@rollup/plugin-babel');
-const VuePlugin = require('rollup-plugin-vue');
-const commonjs = require('@rollup/plugin-commonjs');
-const { minifyJsCode } = require('./minify.es6.js');
-require('dotenv').config();
+import { resolve } from 'node:path';
+import { writeFile, copyFile, rm } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import { rollup, watch } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import replace from '@rollup/plugin-replace';
+import { babel } from '@rollup/plugin-babel';
+import VuePlugin from 'rollup-plugin-vue';
+import commonjs from '@rollup/plugin-commonjs';
+import dotenv from 'dotenv';
+import { minifyCode } from './minify.mjs';
 
-const inputJS = 'administrator/components/com_media/resources/scripts/mediamanager.es6.js';
+dotenv.config();
+
+const inputJS = 'administrator/components/com_media/resources/scripts/mediamanager.mjs';
 const isProduction = process.env.NODE_ENV !== 'DEVELOPMENT';
 
 const buildLegacy = async (file) => {
   // eslint-disable-next-line no-console
   console.log('Building Legacy Media Manager...');
 
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: file,
     plugins: [
       nodeResolve(),
@@ -53,7 +55,7 @@ const buildLegacy = async (file) => {
     name: 'JoomlaMediaManager',
     file: 'media/com_media/js/media-manager-es5.js',
   })
-    .then((value) => minifyJsCode(value.output[0].code))
+    .then((value) => minifyCode(value.output[0].code))
     .then((content) => {
       // eslint-disable-next-line no-console
       console.log('✅ Legacy Media Manager ready');
@@ -68,11 +70,11 @@ const buildLegacy = async (file) => {
   await bundle.close();
 };
 
-module.exports.mediaManager = async () => {
+const mediaManager = async () => {
   // eslint-disable-next-line no-console
   console.log('Building Media Manager ES Module...');
 
-  const bundle = await rollup.rollup({
+  const bundle = await rollup({
     input: resolve(inputJS),
     plugins: [
       VuePlugin({
@@ -121,7 +123,7 @@ module.exports.mediaManager = async () => {
     sourcemap: !isProduction ? 'inline' : false,
     file: 'media/com_media/js/media-manager.js',
   })
-    .then((value) => (isProduction ? minifyJsCode(value.output[0].code) : value.output[0]))
+    .then((value) => (isProduction ? minifyCode(value.output[0].code) : value.output[0]))
     .then((content) => {
       if (isProduction) {
         // eslint-disable-next-line no-console
@@ -148,7 +150,7 @@ module.exports.mediaManager = async () => {
   await bundle.close();
 };
 
-module.exports.watchMediaManager = async () => {
+const watchMediaManager = async () => {
   if (existsSync(resolve('media/com_media/js/media-manager-es5.js'))) {
     rm(resolve('media/com_media/js/media-manager-es5.js'));
   }
@@ -159,7 +161,7 @@ module.exports.watchMediaManager = async () => {
   console.log('Watching Media Manager js+vue files...');
   // eslint-disable-next-line no-console
   console.log('=========');
-  const watcher = rollup.watch({
+  const watcher = watch({
     input: resolve(inputJS),
     plugins: [
       VuePlugin({
@@ -223,3 +225,5 @@ module.exports.watchMediaManager = async () => {
     if (code === 'BUNDLE_END') console.log('Files updated ✅');
   });
 };
+
+export { mediaManager, watchMediaManager };
diff --git a/build/build-modules-js/javascript/compile-to-es2017.es6.js b/build/build-modules-js/javascript/compile-to-es2017.es6.js
deleted file mode 100644
index dc90baa5a58bd..0000000000000
--- a/build/build-modules-js/javascript/compile-to-es2017.es6.js
+++ /dev/null
@@ -1,111 +0,0 @@
-const { access, writeFile } = require('fs').promises;
-const { constants } = require('fs');
-const { basename, sep, resolve } = require('path');
-const rollup = require('rollup');
-const { nodeResolve } = require('@rollup/plugin-node-resolve');
-const replace = require('@rollup/plugin-replace');
-const { babel } = require('@rollup/plugin-babel');
-const LightningCSS = require('lightningcss');
-const { renderSync } = require('sass-embedded');
-const { minifyJsCode } = require('./minify.es6.js');
-const { handleESMToLegacy } = require('./compile-to-es5.es6.js');
-
-const getWcMinifiedCss = async (file) => {
-  let scssFileExists = false;
-  const scssFile = file.replace(`${sep}js${sep}`, `${sep}scss${sep}`).replace(/\.w-c\.es6\.js$/, '.scss');
-  try {
-    // eslint-disable-next-line no-bitwise
-    await access(scssFile, constants.R_OK | constants.W_OK);
-
-    scssFileExists = true;
-  } catch { /* nothing */ }
-
-  /// {{CSS_CONTENTS_PLACEHOLDER}}
-  if (scssFileExists) {
-    let compiled;
-    try {
-      compiled = renderSync({ file: scssFile });
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(`${error.column}
-                    ${error.message}
-                    ${error.line}`);
-    }
-
-    if (typeof compiled === 'object' && compiled.css) {
-      const { code } = LightningCSS.transform({
-        code: Buffer.from(compiled.css.toString()),
-        minify: true,
-      });
-      return code;
-    }
-  }
-
-  return '';
-};
-
-/**
- * Compiles es6 files to es5.
- *
- * @param file the full path to the file + filename + extension
- */
-module.exports.handleESMFile = async (file) => {
-  const newPath = file.replace(/\.w-c\.es6\.js$/, '').replace(/\.es6\.js$/, '').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
-  const minifiedCss = await getWcMinifiedCss(file);
-  const bundle = await rollup.rollup({
-    input: resolve(file),
-    plugins: [
-      nodeResolve({
-        preferBuiltins: false,
-      }),
-      replace({
-        preventAssignment: true,
-        CSS_CONTENTS_PLACEHOLDER: minifiedCss,
-        delimiters: ['{{', '}}'],
-      }),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              targets: {
-                browsers: [
-                  '> 1%',
-                  'not ie 11',
-                  'not op_mini all',
-                ],
-              },
-              bugfixes: true,
-              loose: true,
-            },
-          ],
-        ],
-      }),
-    ],
-    external: [],
-  });
-
-  bundle.write({
-    format: 'es',
-    sourcemap: false,
-    file: resolve(`${newPath}.js`),
-  })
-    .then((value) => minifyJsCode(value.output[0].code))
-    .then((content) => {
-      // eslint-disable-next-line no-console
-      console.log(`✅ ES2017 file: ${basename(file).replace('.es6.js', '.js')}: transpiled`);
-
-      return writeFile(resolve(`${newPath}.min.js`), content.code, { encoding: 'utf8', mode: 0o644 });
-    })
-    .then(() => handleESMToLegacy(resolve(`${newPath}.js`)))
-    .catch((error) => {
-      // eslint-disable-next-line no-console
-      console.error(error);
-    });
-
-  // closes the bundle
-  await bundle.close();
-};
diff --git a/build/build-modules-js/javascript/compile-to-es2017.mjs b/build/build-modules-js/javascript/compile-to-es2017.mjs
new file mode 100644
index 0000000000000..44f4dd685989a
--- /dev/null
+++ b/build/build-modules-js/javascript/compile-to-es2017.mjs
@@ -0,0 +1,67 @@
+import { writeFile } from 'node:fs/promises';
+import { basename, sep, resolve } from 'node:path';
+import { rollup } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import { babel } from '@rollup/plugin-babel';
+import { minifyCode } from './minify.mjs';
+import { handleESMToLegacy } from './compile-to-es5.mjs';
+
+/**
+ * Compiles es6 files to es5.
+ *
+ * @param file the full path to the file + filename + extension
+ */
+export const handleESMFile = async (file) => {
+  const newPath = file.replace(/\.mjs$/, '').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
+  const bundle = await rollup({
+    input: resolve(file),
+    plugins: [
+      nodeResolve({
+        preferBuiltins: false,
+      }),
+      babel({
+        exclude: 'node_modules/core-js/**',
+        babelHelpers: 'bundled',
+        babelrc: false,
+        presets: [
+          [
+            '@babel/preset-env',
+            {
+              targets: {
+                browsers: [
+                  '> 1%',
+                  'not ie 11',
+                  'not op_mini all',
+                ],
+              },
+              bugfixes: true,
+              loose: true,
+            },
+          ],
+        ],
+      }),
+    ],
+    external: [],
+  });
+
+  bundle.write({
+    format: 'es',
+    sourcemap: false,
+    file: resolve(`${newPath}.js`),
+  })
+    .then((value) => minifyCode(value.output[0].code))
+    .then((content) => {
+      // eslint-disable-next-line no-console
+      console.log(`✅ ES2017 file: ${basename(file).replace('.mjs', '.js')}: transpiled`);
+
+      return writeFile(resolve(`${newPath}.min.js`), content.code, { encoding: 'utf8', mode: 0o644 });
+    })
+    .then(() => handleESMToLegacy(resolve(`${newPath}.js`)))
+    .catch((error) => {
+      // eslint-disable-next-line no-console
+      console.error(error);
+    });
+
+  // closes the bundle
+  await bundle.close();
+};
diff --git a/build/build-modules-js/javascript/compile-to-es5.es6.js b/build/build-modules-js/javascript/compile-to-es5.mjs
similarity index 69%
rename from build/build-modules-js/javascript/compile-to-es5.es6.js
rename to build/build-modules-js/javascript/compile-to-es5.mjs
index bd4527488b136..ab99acbf4b9c8 100644
--- a/build/build-modules-js/javascript/compile-to-es5.es6.js
+++ b/build/build-modules-js/javascript/compile-to-es5.mjs
@@ -1,17 +1,17 @@
-const { basename, resolve } = require('path');
-const rollup = require('rollup');
-const { nodeResolve } = require('@rollup/plugin-node-resolve');
-const { babel } = require('@rollup/plugin-babel');
-const commonjs = require('@rollup/plugin-commonjs');
-const { minifyJs } = require('./minify.es6.js');
+import { basename, resolve } from 'node:path';
+import { rollup } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import { babel } from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
+import { minifyFile } from './minify.mjs';
 
 /**
  * Compiles es6 files to es5.
  *
  * @param file the full path to the file + filename + extension
  */
-module.exports.handleESMToLegacy = async (file) => {
-  const bundleLegacy = await rollup.rollup({
+export const handleESMToLegacy = async (file) => {
+  const bundleLegacy = await rollup({
     input: resolve(file),
     plugins: [
       nodeResolve(),
@@ -48,6 +48,6 @@ module.exports.handleESMToLegacy = async (file) => {
     // eslint-disable-next-line no-console
     console.log(`✅ ES5 file: ${basename(file).replace('.js', '-es5.js')}: transpiled`);
 
-    minifyJs(resolve(`${file.replace(/\.js$/, '')}-es5.js`));
+    minifyFile(resolve(`${file.replace(/\.js$/, '')}-es5.js`));
   });
 };
diff --git a/build/build-modules-js/javascript/handle-es5.es6.js b/build/build-modules-js/javascript/handle-es5.mjs
similarity index 64%
rename from build/build-modules-js/javascript/handle-es5.es6.js
rename to build/build-modules-js/javascript/handle-es5.mjs
index a20085bd9b84d..35d4db1547626 100644
--- a/build/build-modules-js/javascript/handle-es5.es6.js
+++ b/build/build-modules-js/javascript/handle-es5.mjs
@@ -1,8 +1,8 @@
-const FsExtra = require('fs-extra');
-const { basename, dirname, sep } = require('path');
-const { minifyJs } = require('./minify.es6.js');
+import { basename, dirname, sep } from 'node:path';
+import FsExtra from 'fs-extra';
+import { minifyFile } from './minify.mjs';
 
-module.exports.handleES5File = async (file) => {
+export const handleES5File = async (file) => {
   if (file.match(/\.es5\.js$/)) {
     // ES5 file, we will copy the file and then minify it in place
     // Ensure that the directories exist or create them
@@ -11,6 +11,6 @@ module.exports.handleES5File = async (file) => {
     // eslint-disable-next-line no-console
     console.log(`✅ Legacy js file: ${basename(file)}: copied`);
 
-    minifyJs(file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`).replace('.es5.js', '.js'));
+    minifyFile(file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`).replace('.es5.js', '.js'));
   }
 };
diff --git a/build/build-modules-js/javascript/minify.es6.js b/build/build-modules-js/javascript/minify.mjs
similarity index 74%
rename from build/build-modules-js/javascript/minify.es6.js
rename to build/build-modules-js/javascript/minify.mjs
index 0c90d0deceb63..02a4aa54354f3 100644
--- a/build/build-modules-js/javascript/minify.es6.js
+++ b/build/build-modules-js/javascript/minify.mjs
@@ -1,6 +1,10 @@
-const { transform } = require('esbuild');
-const { readFile, writeFile } = require('fs-extra');
-const { basename } = require('path');
+import { basename } from 'node:path';
+import { transform } from 'esbuild';
+
+import pkg from 'fs-extra';
+
+const { readFile, writeFile } = pkg;
+
 /**
  * Minify a js file using Terser
  *
@@ -23,5 +27,4 @@ const minifyFile = async (file) => {
  */
 const minifyCode = async (code) => transform(code, { minify: true });
 
-module.exports.minifyJs = minifyFile;
-module.exports.minifyJsCode = minifyCode;
+export { minifyFile, minifyCode };
diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json
index b46d54e373f50..34f792fc00073 100644
--- a/build/build-modules-js/settings.json
+++ b/build/build-modules-js/settings.json
@@ -31,10 +31,7 @@
           {
             "name": "awesomplete",
             "type": "preset",
-            "dependencies": [
-              "awesomplete#style",
-              "awesomplete#script"
-            ]
+            "dependencies": ["awesomplete#style", "awesomplete#script"]
           }
         ],
         "dependencies": [],
@@ -69,17 +66,13 @@
             "name": "bootstrap.css.grid",
             "type": "style",
             "uri": "bootstrap-grid.min.css",
-            "dependencies": [
-              "bootstrap.css"
-            ]
+            "dependencies": ["bootstrap.css"]
           },
           {
             "name": "bootstrap.es5",
             "type": "script",
             "uri": "bootstrap-es5.min.js",
-            "dependencies": [
-              "core"
-            ],
+            "dependencies": ["core"],
             "attributes": {
               "nomodule": true,
               "defer": true
@@ -89,9 +82,7 @@
             "name": "bootstrap.alert",
             "type": "script",
             "uri": "alert.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -100,9 +91,7 @@
             "name": "bootstrap.button",
             "type": "script",
             "uri": "button.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -111,9 +100,7 @@
             "name": "bootstrap.carousel",
             "type": "script",
             "uri": "carousel.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -122,9 +109,7 @@
             "name": "bootstrap.collapse",
             "type": "script",
             "uri": "collapse.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -133,9 +118,7 @@
             "name": "bootstrap.dropdown",
             "type": "script",
             "uri": "dropdown.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -144,9 +127,7 @@
             "name": "bootstrap.modal",
             "type": "script",
             "uri": "modal.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -155,9 +136,7 @@
             "name": "bootstrap.offcanvas",
             "type": "script",
             "uri": "offcanvas.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -166,9 +145,7 @@
             "name": "bootstrap.popover",
             "type": "script",
             "uri": "popover.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -177,9 +154,7 @@
             "name": "bootstrap.scrollspy",
             "type": "script",
             "uri": "scrollspy.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -188,9 +163,7 @@
             "name": "bootstrap.tab",
             "type": "script",
             "uri": "tab.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -199,9 +172,7 @@
             "name": "bootstrap.toast",
             "type": "script",
             "uri": "toast.min.js",
-            "dependencies": [
-              "bootstrap.es5"
-            ],
+            "dependencies": ["bootstrap.es5"],
             "attributes": {
               "type": "module"
             }
@@ -237,10 +208,7 @@
           {
             "name": "cropperjs",
             "type": "preset",
-            "dependencies": [
-              "cropperjs#style",
-              "cropperjs#script"
-            ]
+            "dependencies": ["cropperjs#style", "cropperjs#script"]
           }
         ],
         "dependencies": [],
@@ -277,10 +245,7 @@
           {
             "name": "choicesjs",
             "type": "preset",
-            "dependencies": [
-              "choicesjs#style",
-              "choicesjs#script"
-            ]
+            "dependencies": ["choicesjs#style", "choicesjs#script"]
           }
         ],
         "dependencies": [],
@@ -331,10 +296,7 @@
           {
             "name": "dragula",
             "type": "preset",
-            "dependencies": [
-              "dragula#style",
-              "dragula#script"
-            ]
+            "dependencies": ["dragula#style", "dragula#script"]
           }
         ],
         "dependencies": [],
@@ -389,7 +351,7 @@
       "hotkeys-js": {
         "name": "hotkeysjs",
         "licenseFilename": "LICENSE",
-        "js" : {
+        "js": {
           "dist/hotkeys.js": "js/hotkeys.js",
           "dist/hotkeys.min.js": "js/hotkeys.min.js"
         },
@@ -434,14 +396,10 @@
             "name": "jquery-migrate",
             "type": "script",
             "uri": "jquery-migrate.min.js",
-            "dependencies": [
-              "jquery"
-            ]
+            "dependencies": ["jquery"]
           }
         ],
-        "dependencies": [
-          "jquery"
-        ],
+        "dependencies": ["jquery"],
         "licenseFilename": "LICENSE.txt"
       },
       "@joomla/joomla-a11y-checker": {
@@ -480,9 +438,7 @@
               "nomodule": true,
               "defer": true
             },
-            "dependencies": [
-              "wcpolyfill"
-            ]
+            "dependencies": ["wcpolyfill"]
           },
           {
             "name": "webcomponent.joomla-alert",
@@ -491,9 +447,7 @@
             "attributes": {
               "type": "module"
             },
-            "dependencies": [
-              "webcomponent.joomla-alert-legacy"
-            ]
+            "dependencies": ["webcomponent.joomla-alert-legacy"]
           },
           {
             "name": "webcomponent.joomla-tab",
@@ -508,9 +462,7 @@
               "nomodule": true,
               "defer": true
             },
-            "dependencies": [
-              "wcpolyfill"
-            ]
+            "dependencies": ["wcpolyfill"]
           },
           {
             "name": "webcomponent.joomla-tab",
@@ -519,9 +471,7 @@
             "attributes": {
               "type": "module"
             },
-            "dependencies": [
-              "webcomponent.joomla-tab-legacy"
-            ]
+            "dependencies": ["webcomponent.joomla-tab-legacy"]
           }
         ],
         "dependencies": [],
@@ -578,9 +528,7 @@
             "name": "minicolors",
             "type": "script",
             "uri": "jquery.minicolors.min.js",
-            "dependencies": [
-              "jquery"
-            ],
+            "dependencies": ["jquery"],
             "attributes": {
               "defer": true
             }
@@ -588,15 +536,10 @@
           {
             "name": "minicolors",
             "type": "preset",
-            "dependencies": [
-              "minicolors#style",
-              "minicolors#script"
-            ]
+            "dependencies": ["minicolors#style", "minicolors#script"]
           }
         ],
-        "dependencies": [
-          "jquery"
-        ],
+        "dependencies": ["jquery"],
         "licenseFilename": "LICENSE.md"
       },
       "codemirror": {
@@ -623,9 +566,7 @@
               "nomodule": true,
               "defer": true
             },
-            "dependencies": [
-              "core"
-            ]
+            "dependencies": ["core"]
           }
         ]
       },
@@ -649,17 +590,12 @@
             "name": "chosen",
             "type": "script",
             "uri": "chosen.jquery.js",
-            "dependencies": [
-              "jquery"
-            ]
+            "dependencies": ["jquery"]
           },
           {
             "name": "chosen",
             "type": "preset",
-            "dependencies": [
-              "chosen#style",
-              "chosen#script"
-            ]
+            "dependencies": ["chosen#style", "chosen#script"]
           }
         ]
       },
@@ -757,17 +693,13 @@
             "name": "qrcode_SJIS",
             "type": "script",
             "uri": "qrcode_SJIS.js",
-            "dependencies": [
-              "qrcode"
-            ]
+            "dependencies": ["qrcode"]
           },
           {
             "name": "qrcode_UTF8",
             "type": "script",
             "uri": "qrcode_UTF8.js",
-            "dependencies": [
-              "qrcode"
-            ]
+            "dependencies": ["qrcode"]
           },
           {
             "name": "qrcode",
diff --git a/build/build-modules-js/stylesheets/handle-css.es6.js b/build/build-modules-js/stylesheets/handle-css.mjs
similarity index 82%
rename from build/build-modules-js/stylesheets/handle-css.es6.js
rename to build/build-modules-js/stylesheets/handle-css.mjs
index 9c626ad0b8d76..2295e66fff7a5 100644
--- a/build/build-modules-js/stylesheets/handle-css.es6.js
+++ b/build/build-modules-js/stylesheets/handle-css.mjs
@@ -1,10 +1,13 @@
+import { dirname, sep } from 'node:path';
+import { transform } from 'lightningcss';
+
+import pkg from 'fs-extra';
+
 const {
   copy, readFile, writeFile, ensureDir,
-} = require('fs-extra');
-const { dirname, sep } = require('path');
-const LightningCSS = require('lightningcss');
+} = pkg;
 
-module.exports.handleCssFile = async (file) => {
+export const handleCssFile = async (file) => {
   const outputFile = file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
   try {
     // CSS file, we will copy the file and then minify it in place
@@ -16,7 +19,7 @@ module.exports.handleCssFile = async (file) => {
     }
 
     const content = await readFile(file, { encoding: 'utf8' });
-    const { code } = LightningCSS.transform({
+    const { code } = transform({
       code: Buffer.from(content),
       minify: true,
     });
diff --git a/build/build-modules-js/stylesheets/handle-scss.es6.js b/build/build-modules-js/stylesheets/handle-scss.mjs
similarity index 72%
rename from build/build-modules-js/stylesheets/handle-scss.es6.js
rename to build/build-modules-js/stylesheets/handle-scss.mjs
index 314f400b39c0c..570aac08791a1 100644
--- a/build/build-modules-js/stylesheets/handle-scss.es6.js
+++ b/build/build-modules-js/stylesheets/handle-scss.mjs
@@ -1,11 +1,11 @@
-const rtlcss = require('rtlcss');
-const { writeFile } = require('fs').promises;
-const { ensureDir } = require('fs-extra');
-const { dirname, sep } = require('path');
-const LightningCSS = require('lightningcss');
-const Sass = require('sass-embedded');
-
-module.exports.handleScssFile = async (file) => {
+import { writeFile } from 'node:fs/promises';
+import { dirname, sep } from 'node:path';
+import rtlcss from 'rtlcss';
+import { ensureDir } from 'fs-extra';
+import { transform, Features } from 'lightningcss';
+import * as Sass from 'sass-embedded';
+
+export const handleScssFile = async (file) => {
   const cssFile = file.replace(`${sep}scss${sep}`, `${sep}css${sep}`)
     .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`)
     .replace('.scss', '.css');
@@ -19,7 +19,7 @@ module.exports.handleScssFile = async (file) => {
     process.exitCode = 1;
   }
 
-  let contents = LightningCSS.transform({
+  let contents = transform({
     code: Buffer.from(compiled.css.toString()),
     minify: false,
   }).code;
@@ -37,10 +37,10 @@ ${contents}`,
     { encoding: 'utf8', mode: 0o644 },
   );
 
-  const cssMin = LightningCSS.transform({
+  const cssMin = transform({
     code: Buffer.from(contents),
     minify: true,
-    exclude: LightningCSS.Features.VendorPrefixes,
+    exclude: Features.VendorPrefixes,
   });
 
   // Ensure the folder exists or create it
diff --git a/build/build-modules-js/stylesheets/scss-transform.es6.js b/build/build-modules-js/stylesheets/scss-transform.mjs
similarity index 79%
rename from build/build-modules-js/stylesheets/scss-transform.es6.js
rename to build/build-modules-js/stylesheets/scss-transform.mjs
index 6cb29421016ce..b7ba809dcad3f 100644
--- a/build/build-modules-js/stylesheets/scss-transform.es6.js
+++ b/build/build-modules-js/stylesheets/scss-transform.mjs
@@ -1,10 +1,10 @@
-const Fs = require('fs').promises;
-const FsExtra = require('fs-extra');
-const { dirname, sep } = require('path');
-const LightningCSS = require('lightningcss');
-const Sass = require('sass-embedded');
+import fs from 'node:fs/promises';
+import { dirname, sep } from 'node:path';
+import FsExtra from 'fs-extra';
+import LightningCSS from 'lightningcss';
+import * as Sass from 'sass-embedded';
 
-module.exports.compile = async (file) => {
+const compile = async (file) => {
   const cssFile = file.replace(`${sep}scss${sep}`, `${sep}css${sep}`)
     .replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
 
@@ -25,7 +25,7 @@ module.exports.compile = async (file) => {
 
   // Ensure the folder exists or create it
   await FsExtra.mkdirs(dirname(cssFile), {});
-  await Fs.writeFile(
+  await fs.writeFile(
     cssFile,
     `@charset "UTF-8";
 ${code}`,
@@ -40,7 +40,7 @@ ${code}`,
 
   // Ensure the folder exists or create it
   FsExtra.mkdirs(dirname(cssFile.replace('.css', '.min.css')), {});
-  await Fs.writeFile(
+  await fs.writeFile(
     cssFile.replace('.css', '.min.css'),
     `@charset "UTF-8";${cssMin.code}`,
     { encoding: 'utf8', mode: 0o644 },
@@ -49,3 +49,5 @@ ${code}`,
   // eslint-disable-next-line no-console
   console.log(`✅ SCSS File compiled: ${cssFile}`);
 };
+
+export default { compile };
diff --git a/build/build-modules-js/utils/debounce.es6.js b/build/build-modules-js/utils/debounce.mjs
similarity index 69%
rename from build/build-modules-js/utils/debounce.es6.js
rename to build/build-modules-js/utils/debounce.mjs
index 26daf161e5afe..11fd6034f6538 100644
--- a/build/build-modules-js/utils/debounce.es6.js
+++ b/build/build-modules-js/utils/debounce.mjs
@@ -7,4 +7,4 @@
  * @param { int }  interval  The interval
  */
 // eslint-disable-next-line no-param-reassign, no-return-assign, default-param-last
-module.exports.debounce = (callback, time = 250, interval) => (...args) => clearTimeout(interval, interval = setTimeout(callback, time, ...args));
+export const debounce = (callback, time = 250, interval) => (...args) => clearTimeout(interval, interval = setTimeout(callback, time, ...args));
diff --git a/build/build-modules-js/utils/hashfromfile.es6.js b/build/build-modules-js/utils/hashfromfile.mjs
similarity index 60%
rename from build/build-modules-js/utils/hashfromfile.es6.js
rename to build/build-modules-js/utils/hashfromfile.mjs
index aa4235d2257da..1316db74570a6 100644
--- a/build/build-modules-js/utils/hashfromfile.es6.js
+++ b/build/build-modules-js/utils/hashfromfile.mjs
@@ -1,12 +1,12 @@
-const { createHash } = require('crypto');
-const { createReadStream } = require('fs');
+import { createHash } from 'node:crypto';
+import { createReadStream } from 'node:fs';
 
 /**
  * Get a SHA1 hash for a given file
  * @param filePath
  * @returns {Promise<unknown>}
  */
-module.exports.createHashFromFile = (filePath) => new Promise((res) => {
+export const createHashFromFile = (filePath) => new Promise((res) => {
   const hash = createHash('sha1');
   createReadStream(filePath).on('data', (data) => hash.update(data)).on('end', () => res(hash.digest('hex')));
 });
diff --git a/build/build-modules-js/utils/timer.es6.js b/build/build-modules-js/utils/timer.mjs
similarity index 88%
rename from build/build-modules-js/utils/timer.es6.js
rename to build/build-modules-js/utils/timer.mjs
index 011b83c89f47f..eb5b9f1fc89f4 100644
--- a/build/build-modules-js/utils/timer.es6.js
+++ b/build/build-modules-js/utils/timer.mjs
@@ -4,7 +4,7 @@
  * @param name
  * @returns {{stop: stop}}
  */
-class Timer {
+export class Timer {
   constructor(name) {
     this.start = new Date();
     this.name = name;
@@ -17,5 +17,3 @@ class Timer {
     console.log('Timer:', this.name, 'finished in', time, 'ms');
   }
 }
-
-module.exports.Timer = Timer;
diff --git a/build/build-modules-js/versioning.es6.js b/build/build-modules-js/versioning.mjs
similarity index 93%
rename from build/build-modules-js/versioning.es6.js
rename to build/build-modules-js/versioning.mjs
index 79ffa8cdc7526..f3eadc802367f 100644
--- a/build/build-modules-js/versioning.es6.js
+++ b/build/build-modules-js/versioning.mjs
@@ -1,12 +1,14 @@
-const {
-  lstat, readdir, readFile, writeFile,
-} = require('fs-extra');
-const {
+import {
   basename, dirname, resolve, sep,
-} = require('path');
-const { createHashFromFile } = require('./utils/hashfromfile.es6.js');
-const { Timer } = require('./utils/timer.es6.js');
+} from 'node:path';
+import pkg from 'fs-extra';
 
+import { createHashFromFile } from './utils/hashfromfile.mjs';
+import { Timer } from './utils/timer.mjs';
+
+const {
+  lstat, readdir, readFile, writeFile,
+} = pkg;
 const RootPath = process.cwd();
 const exclusion = [
   // We will skip these:
@@ -110,7 +112,7 @@ const fixVersion = async (directory) => {
  *
  * @returns {Promise<void>}
  */
-module.exports.versioning = async () => {
+export const versioning = async () => {
   const bench = new Timer('Versioning');
   const tasks = [];
   let mediaDirectories = await readdir(resolve(RootPath, 'media'));
diff --git a/build/build-modules-js/watch.es6.js b/build/build-modules-js/watch.mjs
similarity index 70%
rename from build/build-modules-js/watch.es6.js
rename to build/build-modules-js/watch.mjs
index b17de23a34b6d..831fe2fd4ac68 100644
--- a/build/build-modules-js/watch.es6.js
+++ b/build/build-modules-js/watch.mjs
@@ -1,12 +1,14 @@
-const chokidar = require('chokidar');
-const {
+import {
   join, extname, basename, dirname,
-} = require('path');
-const { handleESMFile } = require('./javascript/compile-to-es2017.es6.js');
-const { handleES5File } = require('./javascript/handle-es5.es6.js');
-const { handleScssFile } = require('./stylesheets/handle-scss.es6.js');
-const { handleCssFile } = require('./stylesheets/handle-css.es6.js');
-const { debounce } = require('./utils/debounce.es6.js');
+} from 'node:path';
+
+import chokidar from 'chokidar';
+
+import { handleESMFile } from './javascript/compile-to-es2017.mjs';
+import { handleES5File } from './javascript/handle-es5.mjs';
+import { handleScssFile } from './stylesheets/handle-scss.mjs';
+import { handleCssFile } from './stylesheets/handle-css.mjs';
+import { debounce } from './utils/debounce.mjs';
 
 const RootPath = process.cwd();
 
@@ -28,7 +30,7 @@ const processFile = (file) => {
   }
 };
 
-module.exports.watching = (path) => {
+export const watching = (path) => {
   const watchingPath = path ? join(RootPath, path) : join(RootPath, 'build/media_source');
   const watcher = chokidar.watch(watchingPath, {
     ignored: /(^|[/\\])\../, // ignore dotfiles
diff --git a/build/build.js b/build/build.mjs
similarity index 66%
rename from build/build.js
rename to build/build.mjs
index a51ff44b3fb31..0e60fbecbecfd 100644
--- a/build/build.js
+++ b/build/build.mjs
@@ -5,41 +5,42 @@
  * npm ci
  *
  * For dedicated tasks, please run:
- * node build.js --build-pages      will create the error pages (for incomplete repo build PHP+NPM)
- * node build.js --copy-assets      will clean the media/vendor folder and then will populate the folder from node_modules
- * node build.js --compile-js       will transpile ES6 files and also uglify the ES6,ES5 files
- * node build.js --compile-css      will compile all the scss defined files and also create a minified version of the css
- * node build.js --compile-bs       will compile all the Bootstrap javascript components
- * node build.js --com-media        will compile the media manager Vue application
- * node build.js --watch-com-media  will watch and compile the media manager Vue application
- * node build.js --gzip             will create gzip files for all the minified stylesheets and scripts.
- * node build.js --versioning       will update all the joomla.assets.json files providing accurate versions for stylesheets and scripts.
+ * node build.mjs --build-pages      will create the error pages (for incomplete repo build PHP+NPM)
+ * node build.mjs --copy-assets      will clean the media/vendor folder and then will populate the folder from node_modules
+ * node build.mjs --compile-js       will transpile ES6 files and also uglify the ES6,ES5 files
+ * node build.mjs --compile-css      will compile all the scss defined files and also create a minified version of the css
+ * node build.mjs --compile-bs       will compile all the Bootstrap javascript components
+ * node build.mjs --com-media        will compile the media manager Vue application
+ * node build.mjs --watch-com-media  will watch and compile the media manager Vue application
+ * node build.mjs --gzip             will create gzip files for all the minified stylesheets and scripts.
+ * node build.mjs --versioning       will update all the joomla.assets.json files providing accurate versions for stylesheets and scripts.
  */
-
-const { Command } = require('commander');
-const semver = require('semver');
+import { createRequire } from 'node:module';
+import { Command } from 'commander';
+import semver from 'semver';
 
 // Joomla Build modules
-const { createErrorPages } = require('./build-modules-js/error-pages.es6.js');
-const { stylesheets } = require('./build-modules-js/compilecss.es6.js');
-const { scripts } = require('./build-modules-js/compilejs.es6.js');
-const { bootstrapJs } = require('./build-modules-js/javascript/build-bootstrap-js.es6.js');
-const { localisePackages } = require('./build-modules-js/init/localise-packages.es6.js');
-const { minifyVendor } = require('./build-modules-js/init/minify-vendor.es6.js');
-const { patchPackages } = require('./build-modules-js/init/patches.es6.js');
-const { cleanVendors } = require('./build-modules-js/init/cleanup-media.es6.js');
-const { recreateMediaFolder } = require('./build-modules-js/init/recreate-media.es6');
-const { watching } = require('./build-modules-js/watch.es6.js');
-const { mediaManager, watchMediaManager } = require('./build-modules-js/javascript/build-com_media-js.es6');
-const { compressFiles } = require('./build-modules-js/compress.es6.js');
-const { versioning } = require('./build-modules-js/versioning.es6.js');
-const { Timer } = require('./build-modules-js/utils/timer.es6.js');
+import createErrorPages from './build-modules-js/error-pages.mjs';
+import stylesheets from './build-modules-js/compilecss.mjs';
+import scripts from './build-modules-js/compilejs.mjs';
+import { bootstrapJs } from './build-modules-js/javascript/build-bootstrap-js.mjs';
+import { localisePackages } from './build-modules-js/init/localise-packages.mjs';
+import { minifyVendor } from './build-modules-js/init/minify-vendor.mjs';
+import { patchPackages } from './build-modules-js/init/patches.mjs';
+import { cleanVendors } from './build-modules-js/init/cleanup-media.mjs';
+import recreateMediaFolder from './build-modules-js/init/recreate-media.mjs';
+import { watching } from './build-modules-js/watch.mjs';
+import { mediaManager, watchMediaManager } from './build-modules-js/javascript/build-com_media-js.mjs';
+import { compressFiles } from './build-modules-js/compress.mjs';
+import { versioning } from './build-modules-js/versioning.mjs';
+import { Timer } from './build-modules-js/utils/timer.mjs';
+
+const require = createRequire(import.meta.url);
 
 // The settings
 const options = require('../package.json');
 const settings = require('./build-modules-js/settings.json');
 
-
 const handleError = (err, terminateCode) => {
   console.error(err); // eslint-disable-line no-console
   process.exitCode = terminateCode;
diff --git a/build/media_source/com_actionlogs/js/admin-actionlogs-default.es6.js b/build/media_source/com_actionlogs/js/admin-actionlogs-default.mjs
similarity index 100%
rename from build/media_source/com_actionlogs/js/admin-actionlogs-default.es6.js
rename to build/media_source/com_actionlogs/js/admin-actionlogs-default.mjs
diff --git a/build/media_source/com_admin/js/admin-help.es6.js b/build/media_source/com_admin/js/admin-help.mjs
similarity index 100%
rename from build/media_source/com_admin/js/admin-help.es6.js
rename to build/media_source/com_admin/js/admin-help.mjs
diff --git a/build/media_source/com_associations/js/admin-associations-default.es6.js b/build/media_source/com_associations/js/admin-associations-default.mjs
similarity index 100%
rename from build/media_source/com_associations/js/admin-associations-default.es6.js
rename to build/media_source/com_associations/js/admin-associations-default.mjs
diff --git a/build/media_source/com_associations/js/admin-associations-modal.es6.js b/build/media_source/com_associations/js/admin-associations-modal.mjs
similarity index 100%
rename from build/media_source/com_associations/js/admin-associations-modal.es6.js
rename to build/media_source/com_associations/js/admin-associations-modal.mjs
diff --git a/build/media_source/com_associations/js/associations-edit.es6.js b/build/media_source/com_associations/js/associations-edit.mjs
similarity index 100%
rename from build/media_source/com_associations/js/associations-edit.es6.js
rename to build/media_source/com_associations/js/associations-edit.mjs
diff --git a/build/media_source/com_banners/js/admin-banner-edit.es6.js b/build/media_source/com_banners/js/admin-banner-edit.mjs
similarity index 100%
rename from build/media_source/com_banners/js/admin-banner-edit.es6.js
rename to build/media_source/com_banners/js/admin-banner-edit.mjs
diff --git a/build/media_source/com_cache/js/admin-cache-default.es6.js b/build/media_source/com_cache/js/admin-cache-default.mjs
similarity index 100%
rename from build/media_source/com_cache/js/admin-cache-default.es6.js
rename to build/media_source/com_cache/js/admin-cache-default.mjs
diff --git a/build/media_source/com_categories/js/shared-categories-accordion.es6.js b/build/media_source/com_categories/js/shared-categories-accordion.mjs
similarity index 100%
rename from build/media_source/com_categories/js/shared-categories-accordion.es6.js
rename to build/media_source/com_categories/js/shared-categories-accordion.mjs
diff --git a/build/media_source/com_config/js/config-default.es6.js b/build/media_source/com_config/js/config-default.mjs
similarity index 100%
rename from build/media_source/com_config/js/config-default.es6.js
rename to build/media_source/com_config/js/config-default.mjs
diff --git a/build/media_source/com_config/js/config-filters.es6.js b/build/media_source/com_config/js/config-filters.mjs
similarity index 100%
rename from build/media_source/com_config/js/config-filters.es6.js
rename to build/media_source/com_config/js/config-filters.mjs
diff --git a/build/media_source/com_config/js/modules-default.es6.js b/build/media_source/com_config/js/modules-default.mjs
similarity index 100%
rename from build/media_source/com_config/js/modules-default.es6.js
rename to build/media_source/com_config/js/modules-default.mjs
diff --git a/build/media_source/com_config/js/templates-default.es6.js b/build/media_source/com_config/js/templates-default.mjs
similarity index 100%
rename from build/media_source/com_config/js/templates-default.es6.js
rename to build/media_source/com_config/js/templates-default.mjs
diff --git a/build/media_source/com_contact/js/admin-contacts-modal.es6.js b/build/media_source/com_contact/js/admin-contacts-modal.mjs
similarity index 100%
rename from build/media_source/com_contact/js/admin-contacts-modal.es6.js
rename to build/media_source/com_contact/js/admin-contacts-modal.mjs
diff --git a/build/media_source/com_contact/js/contacts-list.es6.js b/build/media_source/com_contact/js/contacts-list.mjs
similarity index 100%
rename from build/media_source/com_contact/js/contacts-list.es6.js
rename to build/media_source/com_contact/js/contacts-list.mjs
diff --git a/build/media_source/com_content/js/admin-article-pagebreak.es6.js b/build/media_source/com_content/js/admin-article-pagebreak.mjs
similarity index 100%
rename from build/media_source/com_content/js/admin-article-pagebreak.es6.js
rename to build/media_source/com_content/js/admin-article-pagebreak.mjs
diff --git a/build/media_source/com_content/js/admin-article-readmore.es6.js b/build/media_source/com_content/js/admin-article-readmore.mjs
similarity index 100%
rename from build/media_source/com_content/js/admin-article-readmore.es6.js
rename to build/media_source/com_content/js/admin-article-readmore.mjs
diff --git a/build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js b/build/media_source/com_content/js/admin-articles-default-batch-footer.mjs
similarity index 100%
rename from build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js
rename to build/media_source/com_content/js/admin-articles-default-batch-footer.mjs
diff --git a/build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js b/build/media_source/com_content/js/admin-articles-default-stage-footer.mjs
similarity index 100%
rename from build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js
rename to build/media_source/com_content/js/admin-articles-default-stage-footer.mjs
diff --git a/build/media_source/com_content/js/admin-articles-modal.es6.js b/build/media_source/com_content/js/admin-articles-modal.mjs
similarity index 100%
rename from build/media_source/com_content/js/admin-articles-modal.es6.js
rename to build/media_source/com_content/js/admin-articles-modal.mjs
diff --git a/build/media_source/com_content/js/articles-list.es6.js b/build/media_source/com_content/js/articles-list.mjs
similarity index 100%
rename from build/media_source/com_content/js/articles-list.es6.js
rename to build/media_source/com_content/js/articles-list.mjs
diff --git a/build/media_source/com_content/js/articles-status.es6.js b/build/media_source/com_content/js/articles-status.mjs
similarity index 100%
rename from build/media_source/com_content/js/articles-status.es6.js
rename to build/media_source/com_content/js/articles-status.mjs
diff --git a/build/media_source/com_content/js/form-edit.es6.js b/build/media_source/com_content/js/form-edit.mjs
similarity index 100%
rename from build/media_source/com_content/js/form-edit.es6.js
rename to build/media_source/com_content/js/form-edit.mjs
diff --git a/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js b/build/media_source/com_contenthistory/js/admin-compare-compare.mjs
similarity index 100%
rename from build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
rename to build/media_source/com_contenthistory/js/admin-compare-compare.mjs
diff --git a/build/media_source/com_contenthistory/js/admin-history-modal.es6.js b/build/media_source/com_contenthistory/js/admin-history-modal.mjs
similarity index 100%
rename from build/media_source/com_contenthistory/js/admin-history-modal.es6.js
rename to build/media_source/com_contenthistory/js/admin-history-modal.mjs
diff --git a/build/media_source/com_contenthistory/js/admin-history-versions.es6.js b/build/media_source/com_contenthistory/js/admin-history-versions.mjs
similarity index 100%
rename from build/media_source/com_contenthistory/js/admin-history-versions.es6.js
rename to build/media_source/com_contenthistory/js/admin-history-versions.mjs
diff --git a/build/media_source/com_cpanel/js/admin-add_module.es6.js b/build/media_source/com_cpanel/js/admin-add_module.mjs
similarity index 100%
rename from build/media_source/com_cpanel/js/admin-add_module.es6.js
rename to build/media_source/com_cpanel/js/admin-add_module.mjs
diff --git a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js b/build/media_source/com_cpanel/js/admin-cpanel-default.mjs
similarity index 100%
rename from build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
rename to build/media_source/com_cpanel/js/admin-cpanel-default.mjs
diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/build/media_source/com_cpanel/js/admin-system-loader.mjs
similarity index 100%
rename from build/media_source/com_cpanel/js/admin-system-loader.es6.js
rename to build/media_source/com_cpanel/js/admin-system-loader.mjs
diff --git a/build/media_source/com_fields/js/admin-field-changecontext.es6.js b/build/media_source/com_fields/js/admin-field-changecontext.mjs
similarity index 100%
rename from build/media_source/com_fields/js/admin-field-changecontext.es6.js
rename to build/media_source/com_fields/js/admin-field-changecontext.mjs
diff --git a/build/media_source/com_fields/js/admin-field-edit.es6.js b/build/media_source/com_fields/js/admin-field-edit.mjs
similarity index 100%
rename from build/media_source/com_fields/js/admin-field-edit.es6.js
rename to build/media_source/com_fields/js/admin-field-edit.mjs
diff --git a/build/media_source/com_fields/js/admin-field-typehaschanged.es6.js b/build/media_source/com_fields/js/admin-field-typehaschanged.mjs
similarity index 100%
rename from build/media_source/com_fields/js/admin-field-typehaschanged.es6.js
rename to build/media_source/com_fields/js/admin-field-typehaschanged.mjs
diff --git a/build/media_source/com_fields/js/admin-fields-default-batch.es6.js b/build/media_source/com_fields/js/admin-fields-default-batch.mjs
similarity index 100%
rename from build/media_source/com_fields/js/admin-fields-default-batch.es6.js
rename to build/media_source/com_fields/js/admin-fields-default-batch.mjs
diff --git a/build/media_source/com_fields/js/admin-fields-modal.es6.js b/build/media_source/com_fields/js/admin-fields-modal.mjs
similarity index 100%
rename from build/media_source/com_fields/js/admin-fields-modal.es6.js
rename to build/media_source/com_fields/js/admin-fields-modal.mjs
diff --git a/build/media_source/com_finder/js/filters.es6.js b/build/media_source/com_finder/js/filters.mjs
similarity index 100%
rename from build/media_source/com_finder/js/filters.es6.js
rename to build/media_source/com_finder/js/filters.mjs
diff --git a/build/media_source/com_finder/js/finder-edit.es6.js b/build/media_source/com_finder/js/finder-edit.mjs
similarity index 100%
rename from build/media_source/com_finder/js/finder-edit.es6.js
rename to build/media_source/com_finder/js/finder-edit.mjs
diff --git a/build/media_source/com_finder/js/finder.es6.js b/build/media_source/com_finder/js/finder.mjs
similarity index 100%
rename from build/media_source/com_finder/js/finder.es6.js
rename to build/media_source/com_finder/js/finder.mjs
diff --git a/build/media_source/com_finder/js/indexer.es6.js b/build/media_source/com_finder/js/indexer.mjs
similarity index 100%
rename from build/media_source/com_finder/js/indexer.es6.js
rename to build/media_source/com_finder/js/indexer.mjs
diff --git a/build/media_source/com_finder/js/maps.es6.js b/build/media_source/com_finder/js/maps.mjs
similarity index 100%
rename from build/media_source/com_finder/js/maps.es6.js
rename to build/media_source/com_finder/js/maps.mjs
diff --git a/build/media_source/com_installer/js/changelog.es6.js b/build/media_source/com_installer/js/changelog.mjs
similarity index 100%
rename from build/media_source/com_installer/js/changelog.es6.js
rename to build/media_source/com_installer/js/changelog.mjs
diff --git a/build/media_source/com_installer/js/installer.es6.js b/build/media_source/com_installer/js/installer.mjs
similarity index 100%
rename from build/media_source/com_installer/js/installer.es6.js
rename to build/media_source/com_installer/js/installer.mjs
diff --git a/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js b/build/media_source/com_joomlaupdate/js/admin-update-default.mjs
similarity index 100%
rename from build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
rename to build/media_source/com_joomlaupdate/js/admin-update-default.mjs
diff --git a/build/media_source/com_joomlaupdate/js/default.es6.js b/build/media_source/com_joomlaupdate/js/default.mjs
similarity index 100%
rename from build/media_source/com_joomlaupdate/js/default.es6.js
rename to build/media_source/com_joomlaupdate/js/default.mjs
diff --git a/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js b/build/media_source/com_languages/js/admin-language-edit-change-flag.mjs
similarity index 100%
rename from build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
rename to build/media_source/com_languages/js/admin-language-edit-change-flag.mjs
diff --git a/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js b/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.mjs
similarity index 100%
rename from build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
rename to build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.mjs
diff --git a/build/media_source/com_languages/js/overrider.es6.js b/build/media_source/com_languages/js/overrider.mjs
similarity index 100%
rename from build/media_source/com_languages/js/overrider.es6.js
rename to build/media_source/com_languages/js/overrider.mjs
diff --git a/build/media_source/com_mails/js/admin-email-template-edit.es6.js b/build/media_source/com_mails/js/admin-email-template-edit.mjs
similarity index 100%
rename from build/media_source/com_mails/js/admin-email-template-edit.es6.js
rename to build/media_source/com_mails/js/admin-email-template-edit.mjs
diff --git a/build/media_source/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.mjs
similarity index 100%
rename from build/media_source/com_media/js/edit-images.es6.js
rename to build/media_source/com_media/js/edit-images.mjs
diff --git a/build/media_source/com_menus/js/admin-item-edit.es6.js b/build/media_source/com_menus/js/admin-item-edit.mjs
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-edit.es6.js
rename to build/media_source/com_menus/js/admin-item-edit.mjs
diff --git a/build/media_source/com_menus/js/admin-item-edit_container.es6.js b/build/media_source/com_menus/js/admin-item-edit_container.mjs
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-edit_container.es6.js
rename to build/media_source/com_menus/js/admin-item-edit_container.mjs
diff --git a/build/media_source/com_menus/js/admin-item-edit_modules.es6.js b/build/media_source/com_menus/js/admin-item-edit_modules.mjs
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-edit_modules.es6.js
rename to build/media_source/com_menus/js/admin-item-edit_modules.mjs
diff --git a/build/media_source/com_menus/js/admin-item-modal.es6.js b/build/media_source/com_menus/js/admin-item-modal.mjs
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-modal.es6.js
rename to build/media_source/com_menus/js/admin-item-modal.mjs
diff --git a/build/media_source/com_menus/js/admin-items-modal.es6.js b/build/media_source/com_menus/js/admin-items-modal.mjs
similarity index 100%
rename from build/media_source/com_menus/js/admin-items-modal.es6.js
rename to build/media_source/com_menus/js/admin-items-modal.mjs
diff --git a/build/media_source/com_menus/js/admin-menus-default.es6.js b/build/media_source/com_menus/js/admin-menus-default.mjs
similarity index 100%
rename from build/media_source/com_menus/js/admin-menus-default.es6.js
rename to build/media_source/com_menus/js/admin-menus-default.mjs
diff --git a/build/media_source/com_menus/js/default-batch-body.es6.js b/build/media_source/com_menus/js/default-batch-body.mjs
similarity index 100%
rename from build/media_source/com_menus/js/default-batch-body.es6.js
rename to build/media_source/com_menus/js/default-batch-body.mjs
diff --git a/build/media_source/com_modules/js/admin-module-edit.es6.js b/build/media_source/com_modules/js/admin-module-edit.mjs
similarity index 100%
rename from build/media_source/com_modules/js/admin-module-edit.es6.js
rename to build/media_source/com_modules/js/admin-module-edit.mjs
diff --git a/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js b/build/media_source/com_modules/js/admin-module-edit_assignment.mjs
similarity index 100%
rename from build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
rename to build/media_source/com_modules/js/admin-module-edit_assignment.mjs
diff --git a/build/media_source/com_modules/js/admin-module-search.es6.js b/build/media_source/com_modules/js/admin-module-search.mjs
similarity index 100%
rename from build/media_source/com_modules/js/admin-module-search.es6.js
rename to build/media_source/com_modules/js/admin-module-search.mjs
diff --git a/build/media_source/com_modules/js/admin-modules-modal.es6.js b/build/media_source/com_modules/js/admin-modules-modal.mjs
similarity index 100%
rename from build/media_source/com_modules/js/admin-modules-modal.es6.js
rename to build/media_source/com_modules/js/admin-modules-modal.mjs
diff --git a/build/media_source/com_modules/js/admin-select-modal.es6.js b/build/media_source/com_modules/js/admin-select-modal.mjs
similarity index 100%
rename from build/media_source/com_modules/js/admin-select-modal.es6.js
rename to build/media_source/com_modules/js/admin-select-modal.mjs
diff --git a/build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js b/build/media_source/com_scheduler/js/admin-view-run-test-task.mjs
similarity index 100%
rename from build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js
rename to build/media_source/com_scheduler/js/admin-view-run-test-task.mjs
diff --git a/build/media_source/com_scheduler/js/admin-view-select-task-search.es6.js b/build/media_source/com_scheduler/js/admin-view-select-task-search.mjs
similarity index 100%
rename from build/media_source/com_scheduler/js/admin-view-select-task-search.es6.js
rename to build/media_source/com_scheduler/js/admin-view-select-task-search.mjs
diff --git a/build/media_source/com_scheduler/js/scheduler-config.es6.js b/build/media_source/com_scheduler/js/scheduler-config.mjs
similarity index 100%
rename from build/media_source/com_scheduler/js/scheduler-config.es6.js
rename to build/media_source/com_scheduler/js/scheduler-config.mjs
diff --git a/build/media_source/com_tags/js/tag-default.es6.js b/build/media_source/com_tags/js/tag-default.mjs
similarity index 100%
rename from build/media_source/com_tags/js/tag-default.es6.js
rename to build/media_source/com_tags/js/tag-default.mjs
diff --git a/build/media_source/com_tags/js/tag-list.es6.js b/build/media_source/com_tags/js/tag-list.mjs
similarity index 100%
rename from build/media_source/com_tags/js/tag-list.es6.js
rename to build/media_source/com_tags/js/tag-list.mjs
diff --git a/build/media_source/com_tags/js/tags-default.es6.js b/build/media_source/com_tags/js/tags-default.mjs
similarity index 100%
rename from build/media_source/com_tags/js/tags-default.es6.js
rename to build/media_source/com_tags/js/tags-default.mjs
diff --git a/build/media_source/com_templates/js/admin-template-compare.es6.js b/build/media_source/com_templates/js/admin-template-compare.mjs
similarity index 100%
rename from build/media_source/com_templates/js/admin-template-compare.es6.js
rename to build/media_source/com_templates/js/admin-template-compare.mjs
diff --git a/build/media_source/com_templates/js/admin-template-toggle-assignment.es6.js b/build/media_source/com_templates/js/admin-template-toggle-assignment.mjs
similarity index 100%
rename from build/media_source/com_templates/js/admin-template-toggle-assignment.es6.js
rename to build/media_source/com_templates/js/admin-template-toggle-assignment.mjs
diff --git a/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js b/build/media_source/com_templates/js/admin-template-toggle-switch.mjs
similarity index 100%
rename from build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
rename to build/media_source/com_templates/js/admin-template-toggle-switch.mjs
diff --git a/build/media_source/com_templates/js/admin-templates-default.es6.js b/build/media_source/com_templates/js/admin-templates-default.mjs
similarity index 100%
rename from build/media_source/com_templates/js/admin-templates-default.es6.js
rename to build/media_source/com_templates/js/admin-templates-default.mjs
diff --git a/build/media_source/com_users/js/admin-users-groups.es6.js b/build/media_source/com_users/js/admin-users-groups.mjs
similarity index 100%
rename from build/media_source/com_users/js/admin-users-groups.es6.js
rename to build/media_source/com_users/js/admin-users-groups.mjs
diff --git a/build/media_source/com_users/js/admin-users-mail.es6.js b/build/media_source/com_users/js/admin-users-mail.mjs
similarity index 100%
rename from build/media_source/com_users/js/admin-users-mail.es6.js
rename to build/media_source/com_users/js/admin-users-mail.mjs
diff --git a/build/media_source/com_users/js/two-factor-focus.es6.js b/build/media_source/com_users/js/two-factor-focus.mjs
similarity index 100%
rename from build/media_source/com_users/js/two-factor-focus.es6.js
rename to build/media_source/com_users/js/two-factor-focus.mjs
diff --git a/build/media_source/com_users/js/two-factor-list.es6.js b/build/media_source/com_users/js/two-factor-list.mjs
similarity index 100%
rename from build/media_source/com_users/js/two-factor-list.es6.js
rename to build/media_source/com_users/js/two-factor-list.mjs
diff --git a/build/media_source/com_workflow/js/admin-items-workflow-buttons.es6.js b/build/media_source/com_workflow/js/admin-items-workflow-buttons.mjs
similarity index 100%
rename from build/media_source/com_workflow/js/admin-items-workflow-buttons.es6.js
rename to build/media_source/com_workflow/js/admin-items-workflow-buttons.mjs
diff --git a/build/media_source/com_wrapper/js/iframe-height.es6.js b/build/media_source/com_wrapper/js/iframe-height.mjs
similarity index 100%
rename from build/media_source/com_wrapper/js/iframe-height.es6.js
rename to build/media_source/com_wrapper/js/iframe-height.mjs
diff --git a/build/media_source/layouts/js/joomla/form/field/category-change.es6.js b/build/media_source/layouts/js/joomla/form/field/category-change.mjs
similarity index 100%
rename from build/media_source/layouts/js/joomla/form/field/category-change.es6.js
rename to build/media_source/layouts/js/joomla/form/field/category-change.mjs
diff --git a/build/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js b/build/media_source/layouts/js/joomla/html/batch/batch-copymove.mjs
similarity index 100%
rename from build/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js
rename to build/media_source/layouts/js/joomla/html/batch/batch-copymove.mjs
diff --git a/build/media_source/mod_login/js/admin-login.es6.js b/build/media_source/mod_login/js/admin-login.mjs
similarity index 100%
rename from build/media_source/mod_login/js/admin-login.es6.js
rename to build/media_source/mod_login/js/admin-login.mjs
diff --git a/build/media_source/mod_menu/js/admin-menu.es6.js b/build/media_source/mod_menu/js/admin-menu.mjs
similarity index 100%
rename from build/media_source/mod_menu/js/admin-menu.es6.js
rename to build/media_source/mod_menu/js/admin-menu.mjs
diff --git a/build/media_source/mod_menu/js/menu.es6.js b/build/media_source/mod_menu/js/menu.mjs
similarity index 100%
rename from build/media_source/mod_menu/js/menu.es6.js
rename to build/media_source/mod_menu/js/menu.mjs
diff --git a/build/media_source/mod_multilangstatus/js/admin-multilangstatus.es6.js b/build/media_source/mod_multilangstatus/js/admin-multilangstatus.mjs
similarity index 100%
rename from build/media_source/mod_multilangstatus/js/admin-multilangstatus.es6.js
rename to build/media_source/mod_multilangstatus/js/admin-multilangstatus.mjs
diff --git a/build/media_source/mod_quickicon/js/quickicon.es6.js b/build/media_source/mod_quickicon/js/quickicon.mjs
similarity index 100%
rename from build/media_source/mod_quickicon/js/quickicon.es6.js
rename to build/media_source/mod_quickicon/js/quickicon.mjs
diff --git a/build/media_source/mod_sampledata/js/sampledata-process.es6.js b/build/media_source/mod_sampledata/js/sampledata-process.mjs
similarity index 100%
rename from build/media_source/mod_sampledata/js/sampledata-process.es6.js
rename to build/media_source/mod_sampledata/js/sampledata-process.mjs
diff --git a/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js b/build/media_source/plg_captcha_recaptcha/js/recaptcha.mjs
similarity index 100%
rename from build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js
rename to build/media_source/plg_captcha_recaptcha/js/recaptcha.mjs
diff --git a/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.es6.js b/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.mjs
similarity index 100%
rename from build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.es6.js
rename to build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.mjs
diff --git a/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js b/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.mjs
similarity index 100%
rename from build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
rename to build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.mjs
diff --git a/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js b/build/media_source/plg_editors_none/js/joomla-editor-none.mjs
similarity index 100%
rename from build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
rename to build/media_source/plg_editors_none/js/joomla-editor-none.mjs
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.mjs
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.es6.js
rename to build/media_source/plg_editors_tinymce/js/plugins/highlighter/plugin.mjs
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js b/build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.mjs
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.es6.js
rename to build/media_source/plg_editors_tinymce/js/plugins/highlighter/source.mjs
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce-builder.mjs
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
rename to build/media_source/plg_editors_tinymce/js/tinymce-builder.mjs
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js b/build/media_source/plg_editors_tinymce/js/tinymce.mjs
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/tinymce.es6.js
rename to build/media_source/plg_editors_tinymce/js/tinymce.mjs
diff --git a/build/media_source/plg_installer_folderinstaller/js/folderinstaller.es6.js b/build/media_source/plg_installer_folderinstaller/js/folderinstaller.mjs
similarity index 100%
rename from build/media_source/plg_installer_folderinstaller/js/folderinstaller.es6.js
rename to build/media_source/plg_installer_folderinstaller/js/folderinstaller.mjs
diff --git a/build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js b/build/media_source/plg_installer_packageinstaller/js/packageinstaller.mjs
similarity index 100%
rename from build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js
rename to build/media_source/plg_installer_packageinstaller/js/packageinstaller.mjs
diff --git a/build/media_source/plg_installer_urlinstaller/js/urlinstaller.es6.js b/build/media_source/plg_installer_urlinstaller/js/urlinstaller.mjs
similarity index 100%
rename from build/media_source/plg_installer_urlinstaller/js/urlinstaller.es6.js
rename to build/media_source/plg_installer_urlinstaller/js/urlinstaller.mjs
diff --git a/build/media_source/plg_installer_webinstaller/js/client.es6.js b/build/media_source/plg_installer_webinstaller/js/client.mjs
similarity index 100%
rename from build/media_source/plg_installer_webinstaller/js/client.es6.js
rename to build/media_source/plg_installer_webinstaller/js/client.mjs
diff --git a/build/media_source/plg_media-action_crop/js/crop.es6.js b/build/media_source/plg_media-action_crop/js/crop.mjs
similarity index 100%
rename from build/media_source/plg_media-action_crop/js/crop.es6.js
rename to build/media_source/plg_media-action_crop/js/crop.mjs
diff --git a/build/media_source/plg_media-action_resize/js/resize.es6.js b/build/media_source/plg_media-action_resize/js/resize.mjs
similarity index 100%
rename from build/media_source/plg_media-action_resize/js/resize.es6.js
rename to build/media_source/plg_media-action_resize/js/resize.mjs
diff --git a/build/media_source/plg_media-action_rotate/js/rotate.es6.js b/build/media_source/plg_media-action_rotate/js/rotate.mjs
similarity index 100%
rename from build/media_source/plg_media-action_rotate/js/rotate.es6.js
rename to build/media_source/plg_media-action_rotate/js/rotate.mjs
diff --git a/build/media_source/plg_multifactorauth_totp/js/setup.es6.js b/build/media_source/plg_multifactorauth_totp/js/setup.mjs
similarity index 100%
rename from build/media_source/plg_multifactorauth_totp/js/setup.es6.js
rename to build/media_source/plg_multifactorauth_totp/js/setup.mjs
diff --git a/build/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js b/build/media_source/plg_multifactorauth_webauthn/js/webauthn.mjs
similarity index 100%
rename from build/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js
rename to build/media_source/plg_multifactorauth_webauthn/js/webauthn.mjs
diff --git a/build/media_source/plg_quickicon_eos/js/snooze.es6.js b/build/media_source/plg_quickicon_eos/js/snooze.mjs
similarity index 100%
rename from build/media_source/plg_quickicon_eos/js/snooze.es6.js
rename to build/media_source/plg_quickicon_eos/js/snooze.mjs
diff --git a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.mjs
similarity index 100%
rename from build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
rename to build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.mjs
diff --git a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.mjs
similarity index 100%
rename from build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
rename to build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.mjs
diff --git a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_source/plg_quickicon_overridecheck/js/overridecheck.mjs
similarity index 100%
rename from build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
rename to build/media_source/plg_quickicon_overridecheck/js/overridecheck.mjs
diff --git a/build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js b/build/media_source/plg_quickicon_privacycheck/js/privacycheck.mjs
similarity index 100%
rename from build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js
rename to build/media_source/plg_quickicon_privacycheck/js/privacycheck.mjs
diff --git a/build/media_source/plg_system_debug/js/debug.es6.js b/build/media_source/plg_system_debug/js/debug.mjs
similarity index 100%
rename from build/media_source/plg_system_debug/js/debug.es6.js
rename to build/media_source/plg_system_debug/js/debug.mjs
diff --git a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js b/build/media_source/plg_system_guidedtours/js/guidedtours.mjs
similarity index 100%
rename from build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
rename to build/media_source/plg_system_guidedtours/js/guidedtours.mjs
diff --git a/build/media_source/plg_system_jooa11y/js/jooa11y.es6.js b/build/media_source/plg_system_jooa11y/js/jooa11y.mjs
similarity index 100%
rename from build/media_source/plg_system_jooa11y/js/jooa11y.es6.js
rename to build/media_source/plg_system_jooa11y/js/jooa11y.mjs
diff --git a/build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js b/build/media_source/plg_system_schedulerunner/js/run-schedule.mjs
similarity index 100%
rename from build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js
rename to build/media_source/plg_system_schedulerunner/js/run-schedule.mjs
diff --git a/build/media_source/plg_system_shortcut/js/shortcut.es6.js b/build/media_source/plg_system_shortcut/js/shortcut.mjs
similarity index 100%
rename from build/media_source/plg_system_shortcut/js/shortcut.es6.js
rename to build/media_source/plg_system_shortcut/js/shortcut.mjs
diff --git a/build/media_source/plg_system_stats/js/stats-message.es6.js b/build/media_source/plg_system_stats/js/stats-message.mjs
similarity index 100%
rename from build/media_source/plg_system_stats/js/stats-message.es6.js
rename to build/media_source/plg_system_stats/js/stats-message.mjs
diff --git a/build/media_source/plg_system_stats/js/stats.es6.js b/build/media_source/plg_system_stats/js/stats.mjs
similarity index 100%
rename from build/media_source/plg_system_stats/js/stats.es6.js
rename to build/media_source/plg_system_stats/js/stats.mjs
diff --git a/build/media_source/plg_system_webauthn/js/login.es6.js b/build/media_source/plg_system_webauthn/js/login.mjs
similarity index 100%
rename from build/media_source/plg_system_webauthn/js/login.es6.js
rename to build/media_source/plg_system_webauthn/js/login.mjs
diff --git a/build/media_source/plg_system_webauthn/js/management.es6.js b/build/media_source/plg_system_webauthn/js/management.mjs
similarity index 100%
rename from build/media_source/plg_system_webauthn/js/management.es6.js
rename to build/media_source/plg_system_webauthn/js/management.mjs
diff --git a/build/media_source/plg_user_token/js/token.es6.js b/build/media_source/plg_user_token/js/token.mjs
similarity index 100%
rename from build/media_source/plg_user_token/js/token.es6.js
rename to build/media_source/plg_user_token/js/token.mjs
diff --git a/build/media_source/system/js/core.es6.js b/build/media_source/system/js/core.mjs
similarity index 100%
rename from build/media_source/system/js/core.es6.js
rename to build/media_source/system/js/core.mjs
diff --git a/build/media_source/system/js/draggable.es6.js b/build/media_source/system/js/draggable.mjs
similarity index 100%
rename from build/media_source/system/js/draggable.es6.js
rename to build/media_source/system/js/draggable.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-color-slider.es6.js b/build/media_source/system/js/fields/joomla-field-color-slider.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-color-slider.es6.js
rename to build/media_source/system/js/fields/joomla-field-color-slider.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-fancy-select.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-fancy-select.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-media.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-media.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-module-order.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-module-order.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-permissions.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-permissions.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-send-test-mail.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-send-test-mail.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-simple-color.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-simple-color.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-subform.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-subform.mjs
diff --git a/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-user.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-field-user.mjs
diff --git a/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js b/build/media_source/system/js/fields/joomla-media-select.mjs
similarity index 100%
rename from build/media_source/system/js/fields/joomla-media-select.w-c.es6.js
rename to build/media_source/system/js/fields/joomla-media-select.mjs
diff --git a/build/media_source/system/js/fields/passwordstrength.es6.js b/build/media_source/system/js/fields/passwordstrength.mjs
similarity index 100%
rename from build/media_source/system/js/fields/passwordstrength.es6.js
rename to build/media_source/system/js/fields/passwordstrength.mjs
diff --git a/build/media_source/system/js/fields/passwordview.es6.js b/build/media_source/system/js/fields/passwordview.mjs
similarity index 100%
rename from build/media_source/system/js/fields/passwordview.es6.js
rename to build/media_source/system/js/fields/passwordview.mjs
diff --git a/build/media_source/system/js/fields/select-colour.es6.js b/build/media_source/system/js/fields/select-colour.mjs
similarity index 100%
rename from build/media_source/system/js/fields/select-colour.es6.js
rename to build/media_source/system/js/fields/select-colour.mjs
diff --git a/build/media_source/system/js/fields/validate.es6.js b/build/media_source/system/js/fields/validate.mjs
similarity index 100%
rename from build/media_source/system/js/fields/validate.es6.js
rename to build/media_source/system/js/fields/validate.mjs
diff --git a/build/media_source/system/js/highlight.es6.js b/build/media_source/system/js/highlight.mjs
similarity index 100%
rename from build/media_source/system/js/highlight.es6.js
rename to build/media_source/system/js/highlight.mjs
diff --git a/build/media_source/system/js/inlinehelp.es6.js b/build/media_source/system/js/inlinehelp.mjs
similarity index 100%
rename from build/media_source/system/js/inlinehelp.es6.js
rename to build/media_source/system/js/inlinehelp.mjs
diff --git a/build/media_source/system/js/joomla-core-loader.mjs b/build/media_source/system/js/joomla-core-loader.mjs
new file mode 100644
index 0000000000000..63d126040c259
--- /dev/null
+++ b/build/media_source/system/js/joomla-core-loader.mjs
@@ -0,0 +1,251 @@
+const style = `
+:host {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 10000;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  opacity: 0.8;
+}
+.box {
+  position: relative;
+  width: 345px;
+  height: 345px;
+  margin: 0 auto;
+}
+.box p {
+  float: right;
+  margin: 95px 0 0;
+  font: normal 1.25em/1em sans-serif;
+  color: #999;
+}
+.box > span {
+  animation: jspinner 2s infinite ease-in-out;
+}
+.box .red {
+  animation-delay: -1.5s;
+}
+.box .blue {
+  animation-delay: -1s;
+}
+.box .green {
+  animation-delay: -0.5s;
+}
+.yellow {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 90px;
+  height: 90px;
+  content: "";
+  background: #f9a541;
+  border-radius: 90px;
+}
+.yellow::before, .yellow::after {
+  position: absolute;
+  top: 0;
+  left: 0;
+  box-sizing: content-box;
+  width: 50px;
+  content: "";
+  background: transparent;
+  border: 50px solid #f9a541;
+}
+.yellow::before {
+  height: 35px;
+  margin: 60px 0 0 -30px;
+  border-width: 50px 50px 0;
+  border-radius: 75px 75px 0 0;
+}
+.yellow::after {
+  height: 105px;
+  margin: 140px 0 0 -30px;
+  border-width: 0 0 0 50px;
+}
+.red {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 90px;
+  height: 90px;
+  content: "";
+  background: #f44321;
+  border-radius: 90px;
+}
+.red::before, .red::after {
+  position: absolute;
+  top: 0;
+  left: 0;
+  box-sizing: content-box;
+  width: 50px;
+  content: "";
+  background: transparent;
+  border: 50px solid #f44321;
+}
+.red::before {
+  height: 35px;
+  margin: 60px 0 0 -30px;
+  border-width: 50px 50px 0;
+  border-radius: 75px 75px 0 0;
+}
+.red::after {
+  height: 105px;
+  margin: 140px 0 0 -30px;
+  border-width: 0 0 0 50px;
+}
+.blue {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 90px;
+  height: 90px;
+  content: "";
+  background: #5091cd;
+  border-radius: 90px;
+}
+.blue::before, .blue::after {
+  position: absolute;
+  top: 0;
+  left: 0;
+  box-sizing: content-box;
+  width: 50px;
+  content: "";
+  background: transparent;
+  border: 50px solid #5091cd;
+}
+.blue::before {
+  height: 35px;
+  margin: 60px 0 0 -30px;
+  border-width: 50px 50px 0;
+  border-radius: 75px 75px 0 0;
+}
+.blue::after {
+  height: 105px;
+  margin: 140px 0 0 -30px;
+  border-width: 0 0 0 50px;
+}
+.green {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 90px;
+  height: 90px;
+  content: "";
+  background: #7ac143;
+  border-radius: 90px;
+}
+.green::before, .green::after {
+  position: absolute;
+  top: 0;
+  left: 0;
+  box-sizing: content-box;
+  width: 50px;
+  content: "";
+  background: transparent;
+  border: 50px solid #7ac143;
+}
+.green::before {
+  height: 35px;
+  margin: 60px 0 0 -30px;
+  border-width: 50px 50px 0;
+  border-radius: 75px 75px 0 0;
+}
+.green::after {
+  height: 105px;
+  margin: 140px 0 0 -30px;
+  border-width: 0 0 0 50px;
+}
+.yellow {
+  margin: 0 0 0 255px;
+  transform: rotate(45deg);
+}
+.red {
+  margin: 255px 0 0 255px;
+  transform: rotate(135deg);
+}
+.blue {
+  margin: 255px 0 0;
+  transform: rotate(225deg);
+}
+.green {
+  transform: rotate(315deg);
+}
+@keyframes jspinner {
+  0%, 40%, 100% {
+    opacity: 0.3;
+  }
+  20% {
+    opacity: 1;
+  }
+}
+@media (prefers-reduced-motion: reduce) {
+  .box > span {
+    animation: none;
+  }
+}`;
+
+/**
+ * Creates a custom element with the default spinner of the Joomla logo
+ */
+class JoomlaCoreLoader extends HTMLElement {
+  constructor() {
+    super();
+
+    const template = document.createElement('template');
+    template.innerHTML = `<style>${style}</style>
+<div>
+  <span class="yellow"></span>
+  <span class="red"></span>
+  <span class="blue"></span>
+  <span class="green"></span>
+  <p>&trade;</p>
+</div>`;
+
+    // Patch the shadow DOM
+    if (window.ShadyCSS) {
+      window.ShadyCSS.prepareTemplate(template, 'joomla-core-loader');
+    }
+
+    this.attachShadow({ mode: 'open' });
+    this.shadowRoot.appendChild(template.content.cloneNode(true));
+
+    // Patch the shadow DOM
+    if (window.ShadyCSS) {
+      window.ShadyCSS.styleElement(this);
+    }
+  }
+
+  connectedCallback() {
+    this.style.backgroundColor = this.color;
+    this.style.opacity = 0.8;
+    this.shadowRoot.querySelector('div').classList.add('box');
+  }
+
+  static get observedAttributes() {
+    return ['color'];
+  }
+
+  get color() { return this.getAttribute('color') || '#fff'; }
+
+  set color(value) { this.setAttribute('color', value); }
+
+  attributeChangedCallback(attr, oldValue, newValue) {
+    switch (attr) {
+      case 'color':
+        if (newValue && newValue !== oldValue) {
+          this.style.backgroundColor = this.color;
+        }
+        break;
+      default:
+      // Do nothing
+    }
+  }
+}
+
+if (!customElements.get('joomla-core-loader')) {
+  customElements.define('joomla-core-loader', JoomlaCoreLoader);
+}
diff --git a/build/media_source/system/js/joomla-core-loader.w-c.es6.js b/build/media_source/system/js/joomla-core-loader.w-c.es6.js
deleted file mode 100644
index d0d5f44047d8a..0000000000000
--- a/build/media_source/system/js/joomla-core-loader.w-c.es6.js
+++ /dev/null
@@ -1,65 +0,0 @@
-((customElements) => {
-  'strict';
-
-  /**
-   * Creates a custom element with the default spinner of the Joomla logo
-   */
-  class JoomlaCoreLoader extends HTMLElement {
-    constructor() {
-      super();
-
-      const template = document.createElement('template');
-      template.innerHTML = `<style>{{CSS_CONTENTS_PLACEHOLDER}}</style>
-<div>
-    <span class="yellow"></span>
-    <span class="red"></span>
-    <span class="blue"></span>
-    <span class="green"></span>
-    <p>&trade;</p>
-</div>`;
-
-      // Patch the shadow DOM
-      if (window.ShadyCSS) {
-        window.ShadyCSS.prepareTemplate(template, 'joomla-core-loader');
-      }
-
-      this.attachShadow({ mode: 'open' });
-      this.shadowRoot.appendChild(template.content.cloneNode(true));
-
-      // Patch the shadow DOM
-      if (window.ShadyCSS) {
-        window.ShadyCSS.styleElement(this);
-      }
-    }
-
-    connectedCallback() {
-      this.style.backgroundColor = this.color;
-      this.style.opacity = 0.8;
-      this.shadowRoot.querySelector('div').classList.add('box');
-    }
-
-    static get observedAttributes() {
-      return ['color'];
-    }
-
-    get color() { return this.getAttribute('color') || '#fff'; }
-
-    set color(value) { this.setAttribute('color', value); }
-
-    attributeChangedCallback(attr, oldValue, newValue) {
-      switch (attr) {
-        case 'color':
-          if (newValue && newValue !== oldValue) {
-            this.style.backgroundColor = this.color;
-          }
-          break;
-        default:
-        // Do nothing
-      }
-    }
-  }
-
-  if (!customElements.get('joomla-core-loader')) {
-    customElements.define('joomla-core-loader', JoomlaCoreLoader);
-  }
-})(customElements);
diff --git a/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js b/build/media_source/system/js/joomla-hidden-mail.mjs
similarity index 100%
rename from build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
rename to build/media_source/system/js/joomla-hidden-mail.mjs
diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/build/media_source/system/js/joomla-toolbar-button.mjs
similarity index 100%
rename from build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
rename to build/media_source/system/js/joomla-toolbar-button.mjs
diff --git a/build/media_source/system/js/keepalive.es6.js b/build/media_source/system/js/keepalive.mjs
similarity index 100%
rename from build/media_source/system/js/keepalive.es6.js
rename to build/media_source/system/js/keepalive.mjs
diff --git a/build/media_source/system/js/list-view.es6.js b/build/media_source/system/js/list-view.mjs
similarity index 100%
rename from build/media_source/system/js/list-view.es6.js
rename to build/media_source/system/js/list-view.mjs
diff --git a/build/media_source/system/js/messages.es6.js b/build/media_source/system/js/messages.mjs
similarity index 100%
rename from build/media_source/system/js/messages.es6.js
rename to build/media_source/system/js/messages.mjs
diff --git a/build/media_source/system/js/multiselect.es6.js b/build/media_source/system/js/multiselect.mjs
similarity index 100%
rename from build/media_source/system/js/multiselect.es6.js
rename to build/media_source/system/js/multiselect.mjs
diff --git a/build/media_source/system/js/searchtools.es6.js b/build/media_source/system/js/searchtools.mjs
similarity index 100%
rename from build/media_source/system/js/searchtools.es6.js
rename to build/media_source/system/js/searchtools.mjs
diff --git a/build/media_source/system/js/showon.es6.js b/build/media_source/system/js/showon.mjs
similarity index 100%
rename from build/media_source/system/js/showon.es6.js
rename to build/media_source/system/js/showon.mjs
diff --git a/build/media_source/system/js/table-columns.es6.js b/build/media_source/system/js/table-columns.mjs
similarity index 100%
rename from build/media_source/system/js/table-columns.es6.js
rename to build/media_source/system/js/table-columns.mjs
diff --git a/build/media_source/system/scss/joomla-core-loader.scss b/build/media_source/system/scss/joomla-core-loader.scss
deleted file mode 100644
index 498429f46d1bb..0000000000000
--- a/build/media_source/system/scss/joomla-core-loader.scss
+++ /dev/null
@@ -1,124 +0,0 @@
-$theme-colours: ();
-$theme-colours: map-merge((
-  "yellow" : #f9a541,
-  "red"    : #f44321,
-  "blue"   : #5091cd,
-  "green"  : #7ac143,
-), $theme-colours);
-
-:host {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 10000;
-  display: flex;
-  align-items: center;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  opacity: .8;
-}
-
-.box {
-  position: relative;
-  width: 345px;
-  height: 345px;
-  margin: 0 auto;
-
-  p {
-    float: right;
-    margin: 95px 0 0;
-    font: normal 1.25em/1em sans-serif;
-    color: #999;
-  }
-
-  > span {
-    animation: jspinner 2s infinite ease-in-out;
-  }
-
-  .red {
-    animation-delay: -1.5s;
-  }
-  .blue {
-    animation-delay: -1s;
-  }
-  .green {
-    animation-delay: -.5s;
-  }
-}
-
-@each $colour in $theme-colours {
-  $key: nth($colour, 1);
-  $value: nth($colour, 2);
-
-  .#{$key} {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 90px;
-    height: 90px;
-    content: "";
-    background: $value;
-    border-radius: 90px;
-
-    &::before,
-    &::after {
-      position: absolute;
-      top: 0;
-      left: 0;
-      box-sizing: content-box;
-      width: 50px;
-      content: "";
-      background: transparent;
-      border: 50px solid $value;
-    }
-
-    &::before {
-      height: 35px;
-      margin: 60px 0 0 -30px;
-      border-width: 50px 50px 0;
-      border-radius: 75px 75px 0 0;
-    }
-
-    &::after {
-      height: 105px;
-      margin: 140px 0 0 -30px;
-      border-width: 0 0 0 50px;
-    }
-  }
-}
-
-.yellow {
-  margin: 0 0 0 255px;
-  transform: rotate(45deg);
-}
-
-.red {
-  margin: 255px 0 0 255px;
-  transform: rotate(135deg);
-}
-
-.blue {
-  margin: 255px 0 0;
-  transform: rotate(225deg);
-}
-
-.green {
-  transform: rotate(315deg);
-}
-
-@keyframes jspinner {
-  0%, 40%, 100% {
-    opacity: .3;
-  }
-  20% {
-    opacity: 1;
-  }
-}
-
-
-@media (prefers-reduced-motion: reduce) {
-  .box > span {
-    animation: none;
-  }
-}
diff --git a/build/media_source/templates/administrator/atum/js/template.es6.js b/build/media_source/templates/administrator/atum/js/template.mjs
similarity index 100%
rename from build/media_source/templates/administrator/atum/js/template.es6.js
rename to build/media_source/templates/administrator/atum/js/template.mjs
diff --git a/build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js b/build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.mjs
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js
rename to build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.mjs
diff --git a/build/media_source/vendor/bootstrap/js/alert.es6.js b/build/media_source/vendor/bootstrap/js/alert.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/alert.es6.js
rename to build/media_source/vendor/bootstrap/js/alert.mjs
diff --git a/build/media_source/vendor/bootstrap/js/button.es6.js b/build/media_source/vendor/bootstrap/js/button.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/button.es6.js
rename to build/media_source/vendor/bootstrap/js/button.mjs
diff --git a/build/media_source/vendor/bootstrap/js/carousel.es6.js b/build/media_source/vendor/bootstrap/js/carousel.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/carousel.es6.js
rename to build/media_source/vendor/bootstrap/js/carousel.mjs
diff --git a/build/media_source/vendor/bootstrap/js/collapse.es6.js b/build/media_source/vendor/bootstrap/js/collapse.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/collapse.es6.js
rename to build/media_source/vendor/bootstrap/js/collapse.mjs
diff --git a/build/media_source/vendor/bootstrap/js/dropdown.es6.js b/build/media_source/vendor/bootstrap/js/dropdown.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/dropdown.es6.js
rename to build/media_source/vendor/bootstrap/js/dropdown.mjs
diff --git a/build/media_source/vendor/bootstrap/js/index.es6.js b/build/media_source/vendor/bootstrap/js/index.es6.js
deleted file mode 100644
index 55c058ed881dd..0000000000000
--- a/build/media_source/vendor/bootstrap/js/index.es6.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Alert from './alert.es6';
-import Button from './button.es6';
-import Collapse from './collapse.es6';
-import Carousel from './carousel.es6';
-import Dropdown from './dropdown.es6';
-import Modal from './modal.es6';
-import Offcanvas from './offcanvas.es6';
-import { Popover } from './popover.es6';
-import Scrollspy from './scrollspy.es6';
-import Tab from './tab.es6';
-import Toast from './toast.es6';
-
-export {
-  Alert,
-  Button,
-  Collapse,
-  Carousel,
-  Dropdown,
-  Modal,
-  Offcanvas,
-  Popover,
-  Scrollspy,
-  Tab,
-  Toast,
-};
diff --git a/build/media_source/vendor/bootstrap/js/index.mjs b/build/media_source/vendor/bootstrap/js/index.mjs
new file mode 100644
index 0000000000000..8cb4a78317b3b
--- /dev/null
+++ b/build/media_source/vendor/bootstrap/js/index.mjs
@@ -0,0 +1,25 @@
+import Alert from './alert.mjs';
+import Button from './button.mjs';
+import Collapse from './collapse.mjs';
+import Carousel from './carousel.mjs';
+import Dropdown from './dropdown.mjs';
+import Modal from './modal.mjs';
+import Offcanvas from './offcanvas.mjs';
+import { Popover } from './popover.mjs';
+import Scrollspy from './scrollspy.mjs';
+import Tab from './tab.mjs';
+import Toast from './toast.mjs';
+
+export {
+  Alert,
+  Button,
+  Collapse,
+  Carousel,
+  Dropdown,
+  Modal,
+  Offcanvas,
+  Popover,
+  Scrollspy,
+  Tab,
+  Toast,
+};
diff --git a/build/media_source/vendor/bootstrap/js/modal.es6.js b/build/media_source/vendor/bootstrap/js/modal.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/modal.es6.js
rename to build/media_source/vendor/bootstrap/js/modal.mjs
diff --git a/build/media_source/vendor/bootstrap/js/offcanvas.es6.js b/build/media_source/vendor/bootstrap/js/offcanvas.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/offcanvas.es6.js
rename to build/media_source/vendor/bootstrap/js/offcanvas.mjs
diff --git a/build/media_source/vendor/bootstrap/js/popover.es6.js b/build/media_source/vendor/bootstrap/js/popover.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/popover.es6.js
rename to build/media_source/vendor/bootstrap/js/popover.mjs
diff --git a/build/media_source/vendor/bootstrap/js/scrollspy.es6.js b/build/media_source/vendor/bootstrap/js/scrollspy.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/scrollspy.es6.js
rename to build/media_source/vendor/bootstrap/js/scrollspy.mjs
diff --git a/build/media_source/vendor/bootstrap/js/tab.es6.js b/build/media_source/vendor/bootstrap/js/tab.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/tab.es6.js
rename to build/media_source/vendor/bootstrap/js/tab.mjs
diff --git a/build/media_source/vendor/bootstrap/js/toast.es6.js b/build/media_source/vendor/bootstrap/js/toast.mjs
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/toast.es6.js
rename to build/media_source/vendor/bootstrap/js/toast.mjs
diff --git a/package-lock.json b/package-lock.json
index b9589d7db4a78..0fe0f67696eda 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "joomla",
-  "version": "4.4.4",
+  "version": "4.4.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "joomla",
-      "version": "4.4.4",
+      "version": "4.4.7",
       "hasInstallScript": true,
       "license": "GPL-2.0-or-later",
       "dependencies": {
@@ -33,7 +33,7 @@
         "mark.js": "^8.11.1",
         "mediaelement": "^5.1.1",
         "metismenujs": "^1.4.0",
-        "punycode": "^2.3.0",
+        "punycode": "^2.3.1",
         "qrcode-generator": "^1.4.4",
         "roboto-fontface": "^0.10.0",
         "shepherd.js": "^11.2.0",
@@ -3551,9 +3551,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001538",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+      "version": "1.0.30001641",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001641.tgz",
+      "integrity": "sha512-Phv5thgl67bHYo1TtMY/MurjkHhV4EDaCosezRXgZ8jzA/Ub+wjxAvbGvjoFENStinwi5kCyOYV3mi5tOGykwA==",
       "dev": true,
       "funding": [
         {
@@ -3568,7 +3568,8 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/caseless": {
       "version": "0.12.0",
diff --git a/package.json b/package.json
index de22c7687e3e4..c12945f59a19f 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "version": "4.4.7",
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/joomla/joomla-cms.git"
@@ -12,20 +13,20 @@
     "npm": ">=10.1.0"
   },
   "scripts": {
-    "build:js": "node build/build.js --compile-js",
-    "build:css": "node build/build.js --compile-css",
-    "build:bs5": "node build/build.js --compile-bs",
-    "build:com_media": "node --env-file=./build/production.env build/build.js --com-media",
-    "build:com_media:dev": "node --env-file=./build/development.env build/build.js --com-media",
-    "watch": "node build/build.js --watch",
-    "watch:com_media": "node build/build.js --watch-com-media",
-    "lint:js": "eslint --config build/.eslintrc --ignore-pattern '/media/' --ext .es6.js,.es6,.vue .",
-    "lint:testjs": "eslint --config build/.eslintrc --ext .js tests/System",
+    "build:js": "node build/build.mjs --compile-js",
+    "build:css": "node build/build.mjs --compile-css",
+    "build:bs5": "node build/build.mjs --compile-bs",
+    "build:com_media": "node --env-file=./build/production.env build/build.mjs --com-media",
+    "build:com_media:dev": "node --env-file=./build/development.env build/build.mjs --com-media",
+    "watch": "node build/build.mjs --watch",
+    "watch:com_media": "node build/build.mjs --watch-com-media",
+    "lint:js": "eslint --config build/.eslintrc --ignore-pattern 'media/' --ext .mjs,.vue .",
+    "lint:testjs": "eslint --config build/.eslintrc --ext .js,.mjs tests/System",
     "lint:css": "stylelint --config build/.stylelintrc.json \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
-    "install": "node build/build.js --prepare",
-    "update": "node build/build.js --copy-assets && node build/build.js --build-pages && node build/build.js --compile-js && node build/build.js --compile-css && node build/build.js --compile-bs && node --env-file=./build/production.env build/build.js --com-media",
-    "gzip": "node build/build.js --gzip",
-    "versioning": "node build/build.js --versioning",
+    "install": "node build/build.mjs --prepare",
+    "update": "node build/build.mjs --copy-assets && node build/build.mjs --build-pages && node build/build.mjs --compile-js && node build/build.mjs --compile-css && node build/build.mjs --compile-bs && node --env-file=./build/production.env build/build.mjs --com-media",
+    "gzip": "node build/build.mjs --gzip",
+    "versioning": "node build/build.mjs --versioning",
     "browserlist:update": "npx browserslist@latest --update-db",
     "cypress:install": "cypress install",
     "cypress:open": "cypress open --config-file cypress.config.mjs",
@@ -111,4 +112,4 @@
     "stylelint-order": "^5.0.0",
     "stylelint-scss": "^4.7.0"
   }
-}
\ No newline at end of file
+}
diff --git a/tests/System/plugins/fs.mjs b/tests/System/plugins/fs.mjs
index 819d285eb33ea..ae4d35c8da78f 100644
--- a/tests/System/plugins/fs.mjs
+++ b/tests/System/plugins/fs.mjs
@@ -1,5 +1,7 @@
-import { chmodSync, existsSync, writeFileSync, mkdirSync, rmSync } from "fs";
-import { dirname, join } from "path";
+import {
+  chmodSync, existsSync, writeFileSync, mkdirSync, rmSync,
+} from 'fs';
+import { dirname, join } from 'path';
 import { umask } from 'node:process';
 
 /**
diff --git a/tests/System/plugins/index.mjs b/tests/System/plugins/index.mjs
index fff01fe477d04..ab7c8a2b72a5e 100644
--- a/tests/System/plugins/index.mjs
+++ b/tests/System/plugins/index.mjs
@@ -1,6 +1,6 @@
-import { getMails, clearEmails, startMailServer } from "./mail.mjs";
-import { writeRelativeFile, deleteRelativePath } from "./fs.mjs";
-import { queryTestDB, deleteInsertedItems } from "./db.mjs";
+import { getMails, clearEmails, startMailServer } from './mail.mjs';
+import { writeRelativeFile, deleteRelativePath } from './fs.mjs';
+import { queryTestDB, deleteInsertedItems } from './db.mjs';
 
 /**
  * Does the setup of the plugins.
@@ -21,4 +21,3 @@ export default function setupPlugins(on, config) {
     startMailServer: () => startMailServer(config),
   });
 }
-