From a7dbee3b972ce2a599a24c9d2514668e3acdabca Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 26 Feb 2025 10:55:21 +0200 Subject: [PATCH 1/7] Remove the webcomponent polyfill --- build/build-modules-js/settings.json | 22 ---------------------- package-lock.json | 9 +-------- package.json | 1 - 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index 7b376a12bd9dd..c439697680dca 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -609,28 +609,6 @@ "name": "tinymce", "licenseFilename": "license.txt" }, - "@webcomponents/webcomponentsjs": { - "name": "webcomponentsjs", - "js": { - "webcomponents-bundle.js": "js/webcomponents-bundle.js" - }, - "dependencies": [], - "licenseFilename": "LICENSE.md", - "provideAssets": [ - { - "name": "wcpolyfill", - "type": "script", - "uri": "webcomponents-bundle.js", - "attributes": { - "nomodule": true, - "defer": true - }, - "dependencies": [ - "core" - ] - } - ] - }, "chosen-js": { "name": "chosen", "js": { diff --git a/package-lock.json b/package-lock.json index cce256419d4ba..f662aee034982 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "joomla", - "version": "5.3.0", + "version": "6.0.0", "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -28,7 +28,6 @@ "@codemirror/view": "^6.36.4", "@fortawesome/fontawesome-free": "^6.7.2", "@popperjs/core": "^2.11.8", - "@webcomponents/webcomponentsjs": "^2.8.0", "accessibility": "^3.0.17", "awesomplete": "^1.1.7", "bootstrap": "5.3.3", @@ -3476,12 +3475,6 @@ "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==", "license": "MIT" }, - "node_modules/@webcomponents/webcomponentsjs": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.8.0.tgz", - "integrity": "sha512-loGD63sacRzOzSJgQnB9ZAhaQGkN7wl2Zuw7tsphI5Isa0irijrRo6EnJii/GgjGefIFO8AIO7UivzRhFaEk9w==", - "license": "BSD-3-Clause" - }, "node_modules/accessibility": { "version": "3.0.17", "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.17.tgz", diff --git a/package.json b/package.json index d4d9792bf5044..f9f6152042dce 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "@codemirror/view": "^6.36.4", "@fortawesome/fontawesome-free": "^6.7.2", "@popperjs/core": "^2.11.8", - "@webcomponents/webcomponentsjs": "^2.8.0", "accessibility": "^3.0.17", "awesomplete": "^1.1.7", "bootstrap": "5.3.3", From c167f7e6ec4e6005a1bd550ebf4ad54dcfb272ae Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 26 Feb 2025 13:17:22 +0200 Subject: [PATCH 2/7] Remove dependants, add empty asset entry --- .../init/localise-packages.mjs | 8 ++- build/build-modules-js/settings.json | 20 ++----- .../plg_editors_codemirror/joomla.asset.json | 3 +- build/media_source/system/joomla.asset.json | 57 ++++--------------- libraries/src/HTML/Helpers/Select.php | 4 +- 5 files changed, 25 insertions(+), 67 deletions(-) diff --git a/build/build-modules-js/init/localise-packages.mjs b/build/build-modules-js/init/localise-packages.mjs index c4c3e3b7aca13..bcc83a7024c52 100644 --- a/build/build-modules-js/init/localise-packages.mjs +++ b/build/build-modules-js/init/localise-packages.mjs @@ -125,7 +125,13 @@ export const localisePackages = async (options) => { version: options.version, description: options.description, license: options.license, - assets: [], + assets: [ + { + name: 'wcpolyfill', + type: 'script', + uri: '', + }, + ], }; const promises = []; diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index c439697680dca..c417c0f8fb15d 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -490,10 +490,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.joomla-alert", @@ -501,10 +498,7 @@ "uri": "joomla-alert.min.js", "attributes": { "type": "module" - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.joomla-tab", @@ -518,10 +512,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.joomla-tab", @@ -529,10 +520,7 @@ "uri": "joomla-tab.min.js", "attributes": { "type": "module" - }, - "dependencies": [ - "wcpolyfill" - ] + } } ], "dependencies": [], diff --git a/build/media_source/plg_editors_codemirror/joomla.asset.json b/build/media_source/plg_editors_codemirror/joomla.asset.json index 7832390700e09..b9c84925429d9 100644 --- a/build/media_source/plg_editors_codemirror/joomla.asset.json +++ b/build/media_source/plg_editors_codemirror/joomla.asset.json @@ -23,8 +23,7 @@ "dependencies": [ "core", "codemirror", - "editors", - "wcpolyfill" + "editors" ], "attributes": { "type": "module" diff --git a/build/media_source/system/joomla.asset.json b/build/media_source/system/joomla.asset.json index 41ea8393c9aee..a7e208af88a40 100644 --- a/build/media_source/system/joomla.asset.json +++ b/build/media_source/system/joomla.asset.json @@ -322,7 +322,6 @@ "defer": true }, "dependencies": [ - "wcpolyfill", "choicesjs" ] }, @@ -356,10 +355,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.media-select", @@ -381,10 +377,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-media", @@ -405,10 +398,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-module-order", @@ -434,10 +424,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-permissions", @@ -458,10 +445,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-send-test-mail", @@ -487,10 +471,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-simple-color", @@ -511,10 +492,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-subform", @@ -535,10 +513,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.field-user", @@ -560,10 +535,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.core-loader", @@ -584,10 +556,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.hidden-mail", @@ -608,10 +577,7 @@ "attributes": { "nomodule": true, "defer": true - }, - "dependencies": [ - "wcpolyfill" - ] + } }, { "name": "webcomponent.toolbar-button", @@ -631,7 +597,6 @@ "uri": "system/joomla-dialog.min.js", "importmap": true, "dependencies": [ - "wcpolyfill", "core" ] }, diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index dc51a186385f3..59e234cc2a585 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -145,8 +145,8 @@ public static function genericlist( ->registerAndUseScript( 'webcomponent.select-colour', 'system/fields/select-colour.min.js', - ['dependencies' => ['wcpolyfill']], - ['type' => 'module'] + [], + ['type' => 'module'] ); } From 7ae738e7644391b5e10c3cd644e04c4dc10233ba Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 26 Feb 2025 13:52:35 +0200 Subject: [PATCH 3/7] move it to the compat removed --- build/build-modules-js/init/localise-packages.mjs | 8 +------- .../plg_behaviour_compat6/removed.asset.json | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build/build-modules-js/init/localise-packages.mjs b/build/build-modules-js/init/localise-packages.mjs index bcc83a7024c52..c4c3e3b7aca13 100644 --- a/build/build-modules-js/init/localise-packages.mjs +++ b/build/build-modules-js/init/localise-packages.mjs @@ -125,13 +125,7 @@ export const localisePackages = async (options) => { version: options.version, description: options.description, license: options.license, - assets: [ - { - name: 'wcpolyfill', - type: 'script', - uri: '', - }, - ], + assets: [], }; const promises = []; diff --git a/build/media_source/plg_behaviour_compat6/removed.asset.json b/build/media_source/plg_behaviour_compat6/removed.asset.json index cc9cb5a8dbe14..7f4688d2bbec5 100644 --- a/build/media_source/plg_behaviour_compat6/removed.asset.json +++ b/build/media_source/plg_behaviour_compat6/removed.asset.json @@ -1,9 +1,20 @@ { "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json", - "name": "plg_behaviour_compat6", - "version": "6.0.0", + "name": "plg_behaviour_compat", + "version": "5.0.0", "description": "Joomla CMS Removed Assets b/c entries, the entries are only placeholders without functionality.", "license": "GPL-2.0-or-later", "assets": [ + { + "name": "com_scheduler.admin-view-select-task-css", + "type": "style", + "deprecated": true, + "uri": "" + }, + { + "name": "wcpolyfill", + "type": "script", + "uri": "" + } ] } From c1822998656e4a9e0d08fd0d54efe7d78c6d0186 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Wed, 26 Feb 2025 16:03:34 +0200 Subject: [PATCH 4/7] meh --- build/build-modules-js/settings.json | 20 ++++++-- build/media_source/system/joomla.asset.json | 56 +++++++++++++++++---- libraries/src/HTML/Helpers/Select.php | 4 +- 3 files changed, 63 insertions(+), 17 deletions(-) diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json index c417c0f8fb15d..8efcc2170709e 100644 --- a/build/build-modules-js/settings.json +++ b/build/build-modules-js/settings.json @@ -490,7 +490,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.joomla-alert", @@ -498,7 +501,10 @@ "uri": "joomla-alert.min.js", "attributes": { "type": "module" - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.joomla-tab", @@ -512,7 +518,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.joomla-tab", @@ -520,7 +529,10 @@ "uri": "joomla-tab.min.js", "attributes": { "type": "module" - } + }, + "dependencies": [ + "core" + ] } ], "dependencies": [], diff --git a/build/media_source/system/joomla.asset.json b/build/media_source/system/joomla.asset.json index a7e208af88a40..61178b4c45487 100644 --- a/build/media_source/system/joomla.asset.json +++ b/build/media_source/system/joomla.asset.json @@ -322,6 +322,7 @@ "defer": true }, "dependencies": [ + "core", "choicesjs" ] }, @@ -355,7 +356,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.media-select", @@ -377,7 +381,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-media", @@ -398,7 +405,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-module-order", @@ -424,7 +434,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-permissions", @@ -445,7 +458,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-send-test-mail", @@ -471,7 +487,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-simple-color", @@ -492,7 +511,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-subform", @@ -513,7 +535,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.field-user", @@ -535,7 +560,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.core-loader", @@ -556,7 +584,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.hidden-mail", @@ -577,7 +608,10 @@ "attributes": { "nomodule": true, "defer": true - } + }, + "dependencies": [ + "core" + ] }, { "name": "webcomponent.toolbar-button", diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php index 59e234cc2a585..97510182a4c7a 100644 --- a/libraries/src/HTML/Helpers/Select.php +++ b/libraries/src/HTML/Helpers/Select.php @@ -145,8 +145,8 @@ public static function genericlist( ->registerAndUseScript( 'webcomponent.select-colour', 'system/fields/select-colour.min.js', - [], - ['type' => 'module'] + ['dependencies' => ['core']], + ['type' => 'module'] ); } From 064b9cea946f48d22a31178eb26c0033b173ef6f Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Sun, 30 Mar 2025 21:09:16 +0300 Subject: [PATCH 5/7] Update minify-vendor.mjs --- build/build-modules-js/init/minify-vendor.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/build/build-modules-js/init/minify-vendor.mjs b/build/build-modules-js/init/minify-vendor.mjs index 5d2dbd529e751..e98444df0fd5c 100644 --- a/build/build-modules-js/init/minify-vendor.mjs +++ b/build/build-modules-js/init/minify-vendor.mjs @@ -13,7 +13,6 @@ const folders = [ 'media/vendor/diff/js', 'media/vendor/es-module-shims/js', 'media/vendor/qrcode/js', - 'media/vendor/webcomponentsjs/js', ]; let allFiles = []; From 76ff8748ee8206c35060ac0f0998041f24334f7a Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 17 Jul 2025 22:34:59 +0300 Subject: [PATCH 6/7] Update removed.asset.json --- build/media_source/plg_behaviour_compat6/removed.asset.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/media_source/plg_behaviour_compat6/removed.asset.json b/build/media_source/plg_behaviour_compat6/removed.asset.json index 7f4688d2bbec5..2d4388217cd89 100644 --- a/build/media_source/plg_behaviour_compat6/removed.asset.json +++ b/build/media_source/plg_behaviour_compat6/removed.asset.json @@ -1,7 +1,7 @@ { "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json", - "name": "plg_behaviour_compat", - "version": "5.0.0", + "name": "plg_behaviour_compat6", + "version": "6.0.0", "description": "Joomla CMS Removed Assets b/c entries, the entries are only placeholders without functionality.", "license": "GPL-2.0-or-later", "assets": [ From 5c33cee84b29d27fa83ab6174efbc2821631e819 Mon Sep 17 00:00:00 2001 From: Dimitris Grammatikogiannis Date: Thu, 17 Jul 2025 22:36:04 +0300 Subject: [PATCH 7/7] Update removed.asset.json --- build/media_source/plg_behaviour_compat6/removed.asset.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/media_source/plg_behaviour_compat6/removed.asset.json b/build/media_source/plg_behaviour_compat6/removed.asset.json index 2d4388217cd89..df109f28fe91b 100644 --- a/build/media_source/plg_behaviour_compat6/removed.asset.json +++ b/build/media_source/plg_behaviour_compat6/removed.asset.json @@ -5,12 +5,6 @@ "description": "Joomla CMS Removed Assets b/c entries, the entries are only placeholders without functionality.", "license": "GPL-2.0-or-later", "assets": [ - { - "name": "com_scheduler.admin-view-select-task-css", - "type": "style", - "deprecated": true, - "uri": "" - }, { "name": "wcpolyfill", "type": "script",