joomla · wilsonge · Jan 5, 2020 · Aug 3, 2019 · Aug 4, 2019 · Aug 4, 2019
diff --git a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
@@ -144,7 +144,7 @@
 Text::script('JGLOBAL_SELECT_NO_RESULTS_MATCH');
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
-Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
+Factory::getDocument()->getWebAssetManager()->usePreset('choicesjs');
 
 HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 ?>

diff --git a/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php b/administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
@@ -72,7 +72,7 @@
 Text::script('JGLOBAL_SELECT_NO_RESULTS_MATCH');
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
-Factory::getDocument()->getWebAssetManager()->enableAsset('choicesjs');
+Factory::getDocument()->getWebAssetManager()->usePreset('choicesjs');
 HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>

diff --git a/administrator/components/com_modules/tmpl/modules/default_batch_body.php b/administrator/components/com_modules/tmpl/modules/default_batch_body.php
@@ -31,7 +31,7 @@
 Text::script('JGLOBAL_SELECT_NO_RESULTS_MATCH');
 Text::script('JGLOBAL_SELECT_PRESS_TO_SELECT');
 
-$this->document->getWebAssetManager()->enableAsset('choicesjs');
+$this->document->getWebAssetManager()->usePreset('choicesjs');
 HTMLHelper::_('webcomponent', 'system/fields/joomla-field-fancy-select.min.js', ['version' => 'auto', 'relative' => true]);
 
 ?>

diff --git a/administrator/templates/atum/component.php b/administrator/templates/atum/component.php
@@ -10,25 +10,20 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 
 /** @var JDocumentHtml $this */
 
 $lang = Factory::getLanguage();
 $wa   = $this->getWebAssetManager();
 
 // Enable assets
-$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
-$wa->enableAsset('fontawesome-free');
+$wa->useStyle('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
+	->useStyle('template.active.language')
+	->useStyle('template.user');
 
-// Load specific language related CSS
-HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
+// Override 'template.active' asset to set correct ltr/rtl dependency
+$wa->registerStyle('template.active', '', [], [], ['template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
-// Load custom stylesheet if available
-HTMLHelper::_('stylesheet', 'custom.css', ['version' => 'auto', 'relative' => true]);
-
-// TODO: remove the following line whenever the assets are fixed to respect the overrides
-HTMLHelper::_('stylesheet', 'vendor/choicesjs/choices.css', ['version' => 'auto', 'relative' => true]);
 ?>
 
 <!DOCTYPE html>

diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
@@ -46,18 +46,12 @@
 $logoSmallAlt = htmlspecialchars($this->params->get('altSmallLogo', ''), ENT_COMPAT, 'UTF-8');
 
 // Enable assets
-$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
+$wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
+	->useStyle('template.active.language')
+	->useStyle('template.user');
 
-// Load specific language related CSS
-HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
-$wa->enableAsset('fontawesome-free');
-
-// Load customer stylesheet if available
-HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
-
-// Load specific template related JS
-// TODO: Adapt refactored build tools pt.2 @see https://issues.joomla.org/tracker/joomla-cms/23786
-HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']);
+// Override 'template.active' asset to set correct ltr/rtl dependency
+$wa->registerStyle('template.active', '', [], [], ['template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
 // Set some meta data
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');

diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
@@ -45,18 +45,12 @@
 $logoSmallAlt = htmlspecialchars($this->params->get('altSmallLogo', ''), ENT_COMPAT, 'UTF-8');
 
 // Enable assets
-$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
+$wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
+	->useStyle('template.active.language')
+	->useStyle('template.user');
 
-// Load specific language related CSS
-HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
-$wa->enableAsset('fontawesome-free');
-
-// Load customer stylesheet if available
-HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
-
-// Load specific template related JS
-// TODO: Adapt refactored build tools pt.2 @see https://issues.joomla.org/tracker/joomla-cms/23786
-HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']);
+// Override 'template.active' asset to set correct ltr/rtl dependency
+$wa->registerStyle('template.active', '', [], [], ['template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
 // Set some meta data
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');

diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -52,21 +52,12 @@
 $logoSmallAlt = htmlspecialchars($this->params->get('altSmallLogo', ''), ENT_COMPAT, 'UTF-8');
 
 // Enable assets
-$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
-$wa->enableAsset('fontawesome-free');
+$wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
+	->useStyle('template.active.language')
+	->useStyle('template.user');
 
-// Load specific language related CSS
-HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
-
-// Load customer stylesheet if available
-HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
-
-// TODO: remove the following line whenever the assets are fixed to respect the ovverides
-HTMLHelper::_('stylesheet', 'vendor/choicesjs/choices.css', array('version' => 'auto', 'relative' => true));
-
-// Load specific template related JS
-// TODO: Adapt refactored build tools pt.2 @see https://issues.joomla.org/tracker/joomla-cms/23786
-HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']);
+// Override 'template.active' asset to set correct ltr/rtl dependency
+$wa->registerStyle('template.active', '', [], [], ['template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
 // Set some meta data
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');

diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
@@ -6,40 +6,75 @@
   "license": "GPL-2.0-or-later",
   "assets": [
     {
-      "name": "template.atum.base",
+      "name": "template.atum.ltr",
+      "type": "style",
+      "uri": "template.min.css",
       "dependencies": [
-        "core",
-		"bootstrap.js.bundle",
-        "css-vars-ponyfill",
-		"focus-visible"
+        "fontawesome"
       ]
     },
     {
-      "name": "template.atum.ltr",
-      "dependencies": ["template.atum.base"],
-      "css": [
-        "template.min.css",
-        "user.css"
+      "name": "template.atum.rtl",
+      "type": "style",
+      "uri": "template-rtl.min.css",
+      "dependencies": [
+        "fontawesome"
       ]
     },
     {
-      "name": "template.atum.rtl",
-      "dependencies": ["template.atum.base"],
-      "css": [
-        "template-rtl.min.css",
-        "user.css"
+      "name": "template.active.language",
+      "type": "style",
+      "uri": "",
+      "class": "LangActiveAssetItem",
+      "client": "administrator"
+    },
+    {
+      "name": "template.user",
+      "type": "style",
+      "uri": "user.css"
+    },
+    {
+      "name": "template.atum",
+      "type": "script",
+      "uri": "templates/atum/template.min.js",
+      "dependencies": [
+        "core"
+      ]
+    },
+    {
+      "name": "template.active",
+      "type": "script",
+      "uri": "",
+      "description": "A dummy asset to allow extensions to use it as a dependency to active template",
+      "dependencies": [
+        "template.atum"
+      ]
+    },
+    {
+      "name": "template.atum.base",
+      "type": "preset",
+      "dependencies": [
+        "core#script",
+        "bootstrap.js.bundle#script",
+        "css-vars-ponyfill#script",
+        "focus-visible#script",
+        "template.atum#script"
       ]
     },
     {
-      "name": "bootstrap.css",
-      "css": [
-        "bootstrap.min.css"
+      "name": "template.atum.ltr",
+      "type": "preset",
+      "dependencies": [
+        "template.atum.base",
+        "template.atum.ltr#style"
       ]
     },
     {
-      "name": "fontawesome-free",
-      "css": [
-        "vendor/fontawesome-free/fontawesome.min.css"
+      "name": "template.atum.rtl",
+      "type": "preset",
+      "dependencies": [
+        "template.atum.base",
+        "template.atum.rtl#style"
       ]
     }
   ]

diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
@@ -48,18 +48,12 @@
 $logoSmallAlt = htmlspecialchars($this->params->get('altSmallLogo', ''), ENT_COMPAT, 'UTF-8');
 
 // Enable assets
-$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
+$wa->usePreset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'))
+	->useStyle('template.active.language')
+	->useStyle('template.user');
 
-// Load specific language related CSS
-HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);
-$wa->enableAsset('fontawesome-free');
-
-// Load customer stylesheet if available
-HTMLHelper::_('stylesheet', 'custom.css', array('version' => 'auto', 'relative' => true));
-
-// Load specific template related JS
-// TODO: Adapt refactored build tools pt.2 @see https://issues.joomla.org/tracker/joomla-cms/23786
-HTMLHelper::_('script', 'media/templates/' . $this->template . '/js/template.min.js', ['version' => 'auto']);
+// Override 'template.active' asset to set correct ltr/rtl dependency
+$wa->registerStyle('template.active', '', [], [], ['template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
 // Set some meta data
 $this->setMetaData('viewport', 'width=device-width, initial-scale=1');

diff --git a/build/build-modules-js/init.es6.js b/build/build-modules-js/init.es6.js
@@ -266,49 +266,23 @@ const copyFiles = (options) => {
           package: packageName,
           name: assetInfo.name || vendorName,
           version: moduleOptions.version,
+          type: assetInfo.type,
         };
 
         if (assetInfo.dependencies && assetInfo.dependencies.length) {
           registryItem.dependencies = assetInfo.dependencies;
         }
 
-        // Update path for JS and CSS files
-        if (assetInfo.js && assetInfo.js.length) {
-          registryItem.js = [];
+        // Update path to file
+        if (assetInfo.uri && (assetInfo.type === 'script' || assetInfo.type === 'style' || assetInfo.type === 'webcomponent')) {
+          let itemPath = assetInfo.uri;
 
-          assetInfo.js.forEach((assetJS) => {
-            let itemPath = assetJS;
+          // Check for external path
+          if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
+            itemPath = `vendor/${vendorName}/${itemPath}`;
+          }
 
-            // Check for external path
-            if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
-              itemPath = `media/vendor/${vendorName}/js/${itemPath}`;
-            }
-            registryItem.js.push(itemPath);
-
-            // Check if there are any attribute to this file, then update the path
-            if (assetInfo.attribute && assetInfo.attribute[assetJS]) {
-              registryItem.attribute[itemPath] = assetInfo.attribute[assetJS];
-            }
-          });
-        }
-
-        if (assetInfo.css && assetInfo.css.length) {
-          registryItem.css = [];
-
-          assetInfo.css.forEach((assetCSS) => {
-            let itemPath = assetCSS;
-
-            // Check for external path
-            if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
-              itemPath = `media/vendor/${vendorName}/css/${itemPath}`;
-            }
-            registryItem.css.push(itemPath);
-
-            // Check if there are any attribute to this file, then update the path
-            if (assetInfo.attribute && assetInfo.attribute[assetCSS]) {
-              registryItem.attribute[itemPath] = assetInfo.attribute[assetCSS];
-            }
-          });
+          registryItem.uri = itemPath;
         }
 
         registry.assets.push(registryItem);