Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.0] b/c plugin - Load class aliases earlier and move es5 assets #41202

Merged
merged 9 commits into from
Jul 22, 2023
Merged

[5.0] b/c plugin - Load class aliases earlier and move es5 assets #41202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb00bd3
Move classmap import to the plugin constructor
HLeithner Jul 21, 2023
9120102
Merge branch '5.0-dev' into 5/bc/plugin-new
HLeithner Jul 21, 2023
53ebd38
Move es5 assets to b/c plugin
HLeithner Jul 21, 2023
8cda4a4
Update plugins/system/compat/compat.xml
HLeithner Jul 21, 2023
c08d30b
Update plugins/system/compat/src/Extension/Compat.php
HLeithner Jul 21, 2023
5d38610
Move missing es5 assets to b/c plugin
HLeithner Jul 21, 2023
cfbf01d
Move bootstrap.es5 assets to b/c plugin
HLeithner Jul 21, 2023
cb5e77d
Better es5 assets description
HLeithner Jul 21, 2023
cfd192d
Update administrator/language/en-GB/plg_system_compat.ini
HLeithner Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-11.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DROP TABLE IF EXISTS `#__utf8_conversion`;

INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
(0, 'plg_system_compat', 'plugin', 'compat', 'system', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1"}', '', 0, 0);
(0, 'plg_system_compat', 'plugin', 'compat', 'system', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', 0, 0);
2 changes: 1 addition & 1 deletion administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-11.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DROP TABLE IF EXISTS "#__utf8_conversion";

INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
(0, 'plg_system_compat', 'plugin', 'compat', 'system', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1"}', '', 0, 0);
(0, 'plg_system_compat', 'plugin', 'compat', 'system', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', 0, 0);
2 changes: 2 additions & 0 deletions administrator/language/en-GB/plg_system_compat.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@

PLG_COMPAT_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases"
PLG_COMPAT_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace."
PLG_COMPAT_FIELD_ES5_ASSETS_LABEL="ES5 Assets"
PLG_COMPAT_FIELD_ES5_ASSETS_DESCRIPTION="Activate this option if your extension requires *.es5 assets which has resulted in an exception. The assets provided are empty but prevent the exception."
PLG_COMPAT_XML_DESCRIPTION="Provides backward compatibility to the prior major version."
PLG_SYSTEM_COMPAT="System - Backward Compatibility"
14 changes: 0 additions & 14 deletions administrator/templates/atum/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,6 @@
"template.active.language"
]
},
{
"name": "template.atum-es5",
"description": "The file containing the javascript for this template.",
"deprecated": true,
"type": "script",
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "template.atum",
"description": "The file containing the javascript for this template.",
Expand Down
13 changes: 0 additions & 13 deletions build/build-modules-js/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,6 @@
"bootstrap.css"
]
},
{
"name": "bootstrap.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "bootstrap.alert",
"type": "script",
Expand Down
13 changes: 0 additions & 13 deletions build/media_source/com_actionlogs/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_actionlogs.admin-actionlogs.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_actionlogs.admin-actionlogs",
"type": "script",
Expand Down
13 changes: 0 additions & 13 deletions build/media_source/com_admin/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_admin.admin-help.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_admin.admin-help",
"type": "script",
Expand Down
39 changes: 0 additions & 39 deletions build/media_source/com_associations/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_associations.admin-associations-default.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_associations.admin-associations-default",
"type": "script",
Expand All @@ -29,19 +16,6 @@
"type": "module"
}
},
{
"name": "com_associations.admin-associations-modal.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_associations.admin-associations-modal",
"type": "script",
Expand All @@ -53,19 +27,6 @@
"type": "module"
}
},
{
"name": "com_associations.associations-edit.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_associations.associations-edit",
"type": "script",
Expand Down
13 changes: 0 additions & 13 deletions build/media_source/com_banners/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_banners.admin-banner-edit.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_banners.admin-banner-edit",
"type": "script",
Expand Down
13 changes: 0 additions & 13 deletions build/media_source/com_cache/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_cache.admin-cache.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_cache.admin-cache",
"type": "script",
Expand Down
13 changes: 0 additions & 13 deletions build/media_source/com_categories/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,6 @@
"com_categories.shared-categories-accordion#script"
]
},
{
"name": "com_categories.shared-categories-accordion.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_categories.shared-categories-accordion",
"type": "script",
Expand Down
52 changes: 0 additions & 52 deletions build/media_source/com_config/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_config.config.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_config.config",
"type": "script",
Expand All @@ -29,19 +16,6 @@
"type": "module"
}
},
{
"name": "com_config.modules.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_config.modules",
"type": "script",
Expand All @@ -53,19 +27,6 @@
"type": "module"
}
},
{
"name": "com_config.templates.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_config.templates",
"type": "script",
Expand All @@ -77,19 +38,6 @@
"type": "module"
}
},
{
"name": "com_config.filters.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_config.filters",
"type": "script",
Expand Down
26 changes: 0 additions & 26 deletions build/media_source/com_contact/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@
"description": "Joomla CMS",
"license": "GPL-2.0-or-later",
"assets": [
{
"name": "com_contact.admin-contacts-modal.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_contact.admin-contacts-modal",
"type": "script",
Expand All @@ -29,19 +16,6 @@
"type": "module"
}
},
{
"name": "com_contact.contacts-list.es5",
"type": "script",
"deprecated": true,
"uri": "",
"dependencies": [
"core"
],
"attributes": {
"nomodule": true,
"defer": true
}
},
{
"name": "com_contact.contacts-list",
"type": "script",
Expand Down
Loading