Internal assets

Author: riasvdv

composer.json

@@ -72,6 +72,7 @@
     "web-auth/webauthn-lib": "~5.2.4",
     "webonyx/graphql-php": "~14.11.10",
     "yiisoft/arrays": "^3.2",
+    "yiisoft/assets": "^5.1",
     "yiisoft/html": "^3.11",
     "yiisoft/translator": "^3.2",
     "yiisoft/translator-message-php": "^1.1"

composer.lock

@@ -2,7 +2,7 @@
 
 {% set registerJs = false %}
 
-{% do view.registerAssetBundle("craft\\web\\assets\\prismjs\\PrismJsAsset") %}
+{% do registerAsset('prism') %}
 
 {% set jsSettings = {
     id: id|namespaceInputId,

resources/templates/_components/fieldtypes/Assets/input.twig

@@ -1,6 +1,6 @@
 {% import '_includes/forms.twig' as forms %}
 
-{% do view.registerAssetBundle("craft\\web\\assets\\vue\\VueAsset") %}
+{% do registerAsset('vue') %}
 
 {% set suggestions = (suggestions ?? [])
     |merge((suggestTemplates ?? false) ? craft.cp.getTemplateSuggestions() : [])

resources/templates/_includes/forms/autosuggest.twig

@@ -72,9 +72,9 @@
 {% for col in cols %}
     {%- switch col.type %}
         {%- case 'time' %}
-            {%- do view.registerAssetBundle('craft\\web\\assets\\timepicker\\TimepickerAsset') %}
+            {%- do registerAsset('timepicker') %}
         {%- case 'template' %}
-            {%- do view.registerAssetBundle("craft\\web\\assets\\vue\\VueAsset") %}
+            {%- do registerAsset('vue') %}
     {%- endswitch %}
 {% endfor %}
 

resources/templates/_includes/forms/editableTable.twig

@@ -1,5 +1,5 @@
 {% import '_includes/forms' as forms %}
-{% do view.registerAssetBundle("craft\\web\\assets\\money\\MoneyAsset") %}
+{% do registerAsset('money') %}
 
 {% set id = id ?? "money#{random()}" -%}
 {% set decimals = decimals ?? 2 %}

resources/templates/_includes/forms/money.twig

@@ -9,7 +9,7 @@
 {% set isMobile = craft.app.request.isMobileBrowser %}
 {% set isDateTime = isDateTime ?? false %}
 
-{% do view.registerAssetBundle('craft\\web\\assets\\timepicker\\TimepickerAsset') -%}
+{% do registerAsset('timepicker') -%}
 
 {% set containerAttributes = {
     class: ['timewrapper']|merge((class ?? [])|explodeClass),

resources/templates/_includes/forms/time.twig

@@ -1,7 +1,7 @@
 {% requireEdition CraftTeam %}
 
 
-{% do view.registerAssetBundle("craft\\web\\assets\\userpermissions\\UserPermissionsAsset") %}
+{% do registerAsset('user-permissions') %}
 
 {% set wrapperClass = "user-permissions-#{random()}" %}
 

resources/templates/_includes/permissions.twig

@@ -17,8 +17,7 @@
     dir: orientation,
 }|merge(bodyAttributes ?? {}, recursive=true) -%}
 
-{% do view.registerAssetBundle('craft\\web\\assets\\cp\\CpAsset') -%}
-{% set cpAssetUrl = view.getAssetManager().getPublishedUrl('@app/web/assets/cp/dist', true) -%}
+{% do registerAsset('cp') -%}
 
 {% hook "cp.layouts.base" -%}
 
@@ -41,10 +40,10 @@
         {% endif %}
     {% endfor %}
     {% if not hasCustomIcon %}
-        <link rel="icon" href="{{ cpAssetUrl }}/images/icons/favicon.ico">
-        <link rel="icon" type="image/svg+xml" sizes="any" href="{{ cpAssetUrl }}/images/icons/icon.svg">
-        <link rel="apple-touch-icon" sizes="180x180" href="{{ cpAssetUrl }}/images/icons/apple-touch-icon.png">
-        <link rel="mask-icon" href="{{ cpAssetUrl }}/images/icons/safari-pinned-tab.svg" color="#e5422b">
+        <link rel="icon" href="{{ assetUrl('cp', 'images/icons/favicon.ico') }}">
+        <link rel="icon" type="image/svg+xml" sizes="any" href="{{ assetUrl('cp', 'images/icons/icon.svg') }}">
+        <link rel="apple-touch-icon" sizes="180x180" href="{{ assetUrl('cp', 'images/icons/apple-touch-icon.png') }}">
+        <link rel="mask-icon" href="{{ assetUrl('cp', 'images/icons/safari-pinned-tab.svg') }}" color="#e5422b">
     {% endif %}
 
     <script type="text/javascript">

resources/templates/_layouts/base.twig

@@ -2,5 +2,5 @@
 {% set title = "Assets"|t('app') %}
 {% set elementType = 'CraftCms\\Cms\\Asset\\Elements\\Asset' %}
 
-{% do view.registerAssetBundle("craft\\web\\assets\\fileupload\\FileUploadAsset") %}
-{% do view.registerAssetBundle("craft\\web\\assets\\prismjs\\PrismJsAsset") %}
+{% do registerAsset('file-upload') %}
+{% do registerAsset('prism') %}