Skip to content

Allow to deprecate WebAssets #40385

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

Merged
merged 4 commits into from
Apr 28, 2023
Merged

Allow to deprecate WebAssets #40385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3adb85a
Log of deprecated WebAssets
Fedik Apr 14, 2023
37c8839
deprecated com_templates.admin-template-compare
Fedik Apr 17, 2023
461edce
Merge branch '4.4-dev' into webasset-deprecate
laoneo Apr 24, 2023
693b241
Merge branch '4.4-dev' into webasset-deprecate
laoneo Apr 28, 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
4 changes: 3 additions & 1 deletion build/media_source/com_templates/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
],
"attributes": {
"type": "module"
}
},
"deprecated": true,
"deprecatedMsg": "To be removed in Joomla 5.0"
},
{
"name": "com_templates.admin-template-toggle-assignment.es5",
Expand Down
7 changes: 7 additions & 0 deletions libraries/src/Document/Renderer/Html/ScriptsRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,13 @@ private function renderElement($item): string
if ($asset->getDependencies()) {
$attribs['data-asset-dependencies'] = implode(',', $asset->getDependencies());
}

if ($asset->getOption('deprecated')) {
@trigger_error(
sprintf('Web Asset script [%s] is deprecated. %s', $asset->getName(), $asset->getOption('deprecatedMsg', '')),
E_USER_DEPRECATED
);
}
}
} else {
$attribs = $item;
Expand Down
7 changes: 7 additions & 0 deletions libraries/src/Document/Renderer/Html/StylesRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ private function renderElement($item): string
if ($asset->getDependencies()) {
$attribs['data-asset-dependencies'] = implode(',', $asset->getDependencies());
}

if ($asset->getOption('deprecated')) {
@trigger_error(
sprintf('Web Asset style [%s] is deprecated. %s', $asset->getName(), $asset->getOption('deprecatedMsg', '')),
E_USER_DEPRECATED
);
}
}
} else {
$attribs = $item;
Expand Down