* Reshuffled to a shallower AssetBundle tree

nystudio107 · Jan 27, 2017 · 44b9186 · 44b9186
1 parent 6b246e5
commit 44b9186
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 48 deletions.
diff --git a/app/templates/api_version_3_0/src/fields/_Field.php b/app/templates/api_version_3_0/src/fields/_Field.php
@@ -11,7 +11,7 @@
 namespace <%= pluginVendorName %>\<%= pluginDirName %>\fields;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
-use <%= pluginVendorName %>\<%= pluginDirName %>\web\assets\_components\fields\<%= fieldName[index] %>AssetBundle;
+use <%= pluginVendorName %>\<%= pluginDirName %>\web\_components\fields\<%= fieldName[index] %>AssetBundle;
 
 use Craft;
 use craft\base\ElementInterface;

diff --git a/app/templates/api_version_3_0/src/templates/_components/fields/_settings.twig b/app/templates/api_version_3_0/src/templates/_components/fields/_settings.twig
@@ -14,7 +14,7 @@
 
 {% import "_includes/forms" as forms %}
 
-{% do view.registerAssetBundle("<%= pluginVendorName %>\\<%= pluginDirName %>\\web\\assets\\<%= pluginHandle %>AssetBundle") %}
+{% do view.registerAssetBundle("<%= pluginVendorName %>\\<%= pluginDirName %>\\web\\<%= pluginHandle %>AssetBundle") %}
 
 {{ forms.textField({
     label: 'Some Attribute',

diff --git a/app/templates/api_version_3_0/src/templates/_components/widgets/_settings.twig b/app/templates/api_version_3_0/src/templates/_components/widgets/_settings.twig
@@ -14,7 +14,7 @@
 
 {% import "_includes/forms" as forms %}
 
-{% do view.registerAssetBundle("<%= pluginVendorName %>\\<%= pluginDirName %>\\web\\assets\\<%= pluginHandle %>AssetBundle") %}
+{% do view.registerAssetBundle("<%= pluginVendorName %>\\<%= pluginDirName %>\\web\\<%= pluginHandle %>AssetBundle") %}
 
 {{ forms.textField({
     label: 'Message',

diff --git a/app/templates/api_version_3_0/src/templates/_settings.twig b/app/templates/api_version_3_0/src/templates/_settings.twig
@@ -14,7 +14,7 @@
 
 {% import "_includes/forms" as forms %}
 
-{% do view.registerAssetBundle("<%= pluginVendorName %>\\<%= pluginDirName %>\\web\\assets\\<%= pluginHandle %>AssetBundle") %}
+{% do view.registerAssetBundle("<%= pluginVendorName %>\\<%= pluginDirName %>\\web\\<%= pluginHandle %>AssetBundle") %}
 
 {{ forms.textField({
     label: 'Some Field',

diff --git a/app/templates/api_version_3_0/src/utilities/_Utility.php b/app/templates/api_version_3_0/src/utilities/_Utility.php
@@ -11,7 +11,7 @@
 namespace <%= pluginVendorName %>\<%= pluginDirName %>\utilities;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
-use <%= pluginVendorName %>\<%= pluginDirName %>\web\assets\_components\utilities\<%= utilityName[index] %>AssetBundle;
+use <%= pluginVendorName %>\<%= pluginDirName %>\web\_components\utilities\<%= utilityName[index] %>AssetBundle;
 
 use Craft;
 use craft\base\Utility;

diff --git a/...rsion_3_0/src/web/assets/_AssetBundle.php → .../api_version_3_0/src/web/_AssetBundle.php b/...rsion_3_0/src/web/assets/_AssetBundle.php → .../api_version_3_0/src/web/_AssetBundle.php
@@ -8,7 +8,7 @@
  * @copyright <%= copyrightNotice %>
  */
 
-namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\assets;
+namespace <%= pluginVendorName %>\<%= pluginDirName %>\web;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
 
@@ -61,7 +61,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/assets/<%= pluginHandle %>";
+        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/resources";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/...ssets/_components/fields/_AssetBundle.php → ...c/web/_components/fields/_AssetBundle.php b/...ssets/_components/fields/_AssetBundle.php → ...c/web/_components/fields/_AssetBundle.php
@@ -8,7 +8,7 @@
  * @copyright <%= copyrightNotice %>
  */
 
-namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\assets\_components\fields;
+namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\_components\fields;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
 
@@ -61,7 +61,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/assets/_components/fields/<%= fieldName[index] %>";
+        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/_components/fields/resources";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/...omponents/fields/resources/css/_field.css → ...omponents/fields/resources/css/_field.css b/...omponents/fields/resources/css/_field.css → ...omponents/fields/resources/css/_field.css
diff --git a/..._components/fields/resources/js/_field.js → ..._components/fields/resources/js/_field.js b/..._components/fields/resources/js/_field.js → ..._components/fields/resources/js/_field.js
diff --git a/...ts/_components/utilities/_AssetBundle.php → ...eb/_components/utilities/_AssetBundle.php b/...ts/_components/utilities/_AssetBundle.php → ...eb/_components/utilities/_AssetBundle.php
@@ -8,7 +8,7 @@
  * @copyright <%= copyrightNotice %>
  */
 
-namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\assets\_components\utilities;
+namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\_components\utilities;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
 
@@ -61,7 +61,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/assets/_components/utilities/<%= utilityName[index] %>";
+        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/_components/utilities/resources";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/...ents/utilities/resources/css/_utility.css → ...ents/utilities/resources/css/_utility.css b/...ents/utilities/resources/css/_utility.css → ...ents/utilities/resources/css/_utility.css
diff --git a/...onents/utilities/resources/js/_utility.js → ...onents/utilities/resources/js/_utility.js b/...onents/utilities/resources/js/_utility.js → ...onents/utilities/resources/js/_utility.js
diff --git a/...sets/_components/widgets/_AssetBundle.php → .../web/_components/widgets/_AssetBundle.php b/...sets/_components/widgets/_AssetBundle.php → .../web/_components/widgets/_AssetBundle.php
@@ -8,7 +8,7 @@
  * @copyright <%= copyrightNotice %>
  */
 
-namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\assets\_components\widgets;
+namespace <%= pluginVendorName %>\<%= pluginDirName %>\web\_components\widgets;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
 
@@ -61,7 +61,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/assets/_components/widgets/<%= widgetName[index] %>";
+        $this->sourcePath = "@<%= pluginVendorName %>/<%= pluginDirName %>/web/_components/widgets/resources";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/...ponents/widgets/resources/css/_widget.css → ...ponents/widgets/resources/css/_widget.css b/...ponents/widgets/resources/css/_widget.css → ...ponents/widgets/resources/css/_widget.css
diff --git a/...omponents/widgets/resources/js/_widget.js → ...omponents/widgets/resources/js/_widget.js b/...omponents/widgets/resources/js/_widget.js → ...omponents/widgets/resources/js/_widget.js
diff --git a/...0/src/web/assets/resources/css/_style.css → ...sion_3_0/src/web/resources/css/_style.css b/...0/src/web/assets/resources/css/_style.css → ...sion_3_0/src/web/resources/css/_style.css
diff --git a/...version_3_0/src/web/assets/img/plugin.png → ...sion_3_0/src/web/resources/img/plugin.png b/...version_3_0/src/web/assets/img/plugin.png → ...sion_3_0/src/web/resources/img/plugin.png
diff --git a/...on_3_0/src/web/assets/img/plugin_logo.png → ...3_0/src/web/resources/img/plugin_logo.png b/...on_3_0/src/web/assets/img/plugin_logo.png → ...3_0/src/web/resources/img/plugin_logo.png
diff --git a/..._0/src/web/assets/resources/js/_script.js → ...rsion_3_0/src/web/resources/js/_script.js b/..._0/src/web/assets/resources/js/_script.js → ...rsion_3_0/src/web/resources/js/_script.js
diff --git a/app/templates/api_version_3_0/src/widgets/_Widget.php b/app/templates/api_version_3_0/src/widgets/_Widget.php
@@ -11,7 +11,7 @@
 namespace <%= pluginVendorName %>\<%= pluginDirName %>\widgets;
 
 use <%= pluginVendorName %>\<%= pluginDirName%>\<%= pluginHandle %>;
-use <%= pluginVendorName %>\<%= pluginDirName %>\web\assets\_components\widgets\<%= widgetName[index] %>AssetBundle;
+use <%= pluginVendorName %>\<%= pluginDirName %>\web\_components\widgets\<%= widgetName[index] %>AssetBundle;
 
 use Craft;
 use craft\base\Widget;

diff --git a/app/templates/target_apis/api_version_3_0.json b/app/templates/target_apis/api_version_3_0.json
@@ -323,29 +323,27 @@
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/fields/_AssetBundle.php",
-            "destDir": "src/web/assets/_components/fields/",
+            "src": "src/web/_components/fields/_AssetBundle.php",
+            "destDir": "src/web/_components/fields/",
             "dest": "AssetBundle.php",
             "requires": ["fieldtypes"],
             "subPrefix": "fieldName",
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/fields/resources/css/_field.css",
-            "destDir": "src/web/assets/_components/fields/",
+            "src": "src/web/_components/fields/resources/css/_field.css",
+            "destDir": "src/web/_components/fields/resources/css/",
             "dest": ".css",
             "requires": ["fieldtypes"],
             "subPrefix": "fieldName",
-            "dirSubPrefix": "/css/",
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/fields/resources/js/_field.js",
-            "destDir": "src/web/assets/_components/fields/",
+            "src": "src/web/_components/fields/resources/js/_field.js",
+            "destDir": "src/web/_components/fields/resources/js/",
             "dest": ".js",
             "requires": ["fieldtypes"],
             "subPrefix": "fieldName",
-            "dirSubPrefix": "/js/",
             "prefix": false
         },
         {
@@ -404,29 +402,27 @@
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/utilities/_AssetBundle.php",
-            "destDir": "src/web/assets/_components/utilities/",
+            "src": "src/web/_components/utilities/_AssetBundle.php",
+            "destDir": "src/web/_components/utilities/",
             "dest": "AssetBundle.php",
             "requires": ["utilities"],
             "subPrefix": "utilityName",
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/utilities/resources/css/_utility.css",
-            "destDir": "src/web/assets/_components/utilities/",
+            "src": "src/web/_components/utilities/resources/css/_utility.css",
+            "destDir": "src/web/_components/utilities/resources/css/",
             "dest": ".css",
             "requires": ["utilities"],
             "subPrefix": "utilityName",
-            "dirSubPrefix": "/css/",
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/utilities/resources/js/_utility.js",
-            "destDir": "src/web/assets/_components/utilities/",
+            "src": "src/web/_components/utilities/resources/js/_utility.js",
+            "destDir": "src/web/_components/utilities/resources/js/",
             "dest": ".js",
             "requires": ["utilities"],
             "subPrefix": "utilityName",
-            "dirSubPrefix": "/js/",
             "prefix": false
         },
         {
@@ -454,29 +450,27 @@
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/widgets/_AssetBundle.php",
-            "destDir": "src/web/assets/_components/widgets/",
+            "src": "src/web/_components/widgets/_AssetBundle.php",
+            "destDir": "src/web/_components/widgets/",
             "dest": "AssetBundle.php",
             "requires": ["widgets"],
             "subPrefix": "widgetName",
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/widgets/resources/css/_widget.css",
-            "destDir": "src/web/assets/_components/widgets/",
+            "src": "src/web/_components/widgets/resources/css/_widget.css",
+            "destDir": "src/web/_components/widgets/resources/css/",
             "dest": ".css",
             "requires": ["widgets"],
             "subPrefix": "widgetName",
-            "dirSubPrefix": "/css/",
             "prefix": false
         },
         {
-            "src": "src/web/assets/_components/widgets/resources/js/_widget.js",
-            "destDir": "src/web/assets/_components/widgets/",
+            "src": "src/web/_components/widgets/resources/js/_widget.js",
+            "destDir": "src/web/_components/widgets/resources/js/",
             "dest": ".js",
             "requires": ["widgets"],
             "subPrefix": "widgetName",
-            "dirSubPrefix": "/js/",
             "prefix": false
         },
         {
@@ -508,26 +502,24 @@
             "prefix": true
         },
         {
-            "src": "src/web/assets/_AssetBundle.php",
-            "destDir": "src/web/assets/",
+            "src": "src/web/_AssetBundle.php",
+            "destDir": "src/web/",
             "dest": "AssetBundle.php",
             "requires": ["settings"],
             "prefix": true
         },
         {
-            "src": "src/web/assets/resources/css/_style.css",
-            "destDir": "src/web/assets/",
+            "src": "src/web/resources/css/_style.css",
+            "destDir": "src/web/resources/css/",
             "dest": ".css",
             "requires": ["settings"],
-            "dirSubPrefix": "/css/",
             "prefix": true
         },
         {
-            "src": "src/web/assets/resources/js/_script.js",
-            "destDir": "src/web/assets/",
+            "src": "src/web/resources/js/_script.js",
+            "destDir": "src/web/resources/js/",
             "dest": ".js",
             "requires": ["settings"],
-            "dirSubPrefix": "/js/",
             "prefix": true
         }
     ],
@@ -539,11 +531,11 @@
             "src": "src/icon.svg"
         },
         {
-            "src": "src/web/assets/img/plugin.png",
+            "src": "src/web/resources/img/plugin.png",
             "requires": ["settings"]
         },
         {
-            "src": "src/web/assets/img/plugin_logo.png"
+            "src": "src/web/resources/img/plugin_logo.png"
         }
     ],
     "END_INSTALL_COMMANDS": [