Merge branch 'release/1.4.2'

nystudio107 · Feb 5, 2018 · 0bfe970 · 0bfe970
2 parents 0615e11 + 26cf548
commit 0bfe970
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/CHANGLOG.md b/CHANGLOG.md
@@ -1,5 +1,9 @@
 # generator-craftplugin Changelog
 
+## 1.4.2 - 2018.02.05
+### Changed
+* Fixed an issue with the translation and AssetBundle aliases
+
 ## 1.4.1 - 2018.01.26
 ### Changed
 * Fixed module namespacing for controllers & aliases

diff --git a/app/templates/module_api_version_3_0/src/_Module.php b/app/templates/module_api_version_3_0/src/_Module.php
@@ -181,7 +181,7 @@ public function __construct($id, $parent = null, array $config = [])
             $i18n->translations[$id] = [
                 'class' => PhpMessageSource::class,
                 'sourceLanguage' => 'en-US',
-                'basePath' => '@<%= pluginDirName %>/translations',
+                'basePath' => '@modules/<%= pluginDirName %>/translations',
                 'forceTranslation' => true,
                 'allowOverrides' => true,
             ];

diff --git a/app/templates/module_api_version_3_0/src/assetbundles/fieldresources/_FieldAssetBundle.php b/app/templates/module_api_version_3_0/src/assetbundles/fieldresources/_FieldAssetBundle.php
@@ -59,7 +59,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginKebabHandle %>/assetbundles/<%= fieldName[index].toLowerCase() %>field/dist";
+        $this->sourcePath = "@modules/<%= pluginDirName %>/assetbundles/<%= fieldName[index].toLowerCase() %>field/dist";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/app/templates/module_api_version_3_0/src/assetbundles/moduleresources/_ModuleAssetBundle.php b/app/templates/module_api_version_3_0/src/assetbundles/moduleresources/_ModuleAssetBundle.php
@@ -59,7 +59,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginDirName %>/assetbundles/<%= pluginDirName.toLowerCase() %>/dist";
+        $this->sourcePath = "@modules/<%= pluginDirName %>/assetbundles/<%= pluginDirName.toLowerCase() %>/dist";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/...emplates/module_api_version_3_0/src/assetbundles/utilityresources/_UtilityAssetBundle.php b/...emplates/module_api_version_3_0/src/assetbundles/utilityresources/_UtilityAssetBundle.php
@@ -59,7 +59,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginKebabHandle %>/assetbundles/<%= utilityName[index].toLowerCase() %>utility/dist";
+        $this->sourcePath = "@modules/<%= pluginDirName %>/assetbundles/<%= utilityName[index].toLowerCase() %>utility/dist";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/app/templates/module_api_version_3_0/src/assetbundles/widgetresources/_WidgetAssetBundle.php b/app/templates/module_api_version_3_0/src/assetbundles/widgetresources/_WidgetAssetBundle.php
@@ -59,7 +59,7 @@ public function init()
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the path that your publishable resources live
 <% } -%>
-        $this->sourcePath = "@<%= pluginKebabHandle %>/assetbundles/<%= widgetName[index].toLowerCase() %>widget/dist";
+        $this->sourcePath = "@modules/<%= pluginDirName %>/assetbundles/<%= widgetName[index].toLowerCase() %>widget/dist";
 
 <% if ((typeof codeComments !== 'undefined') && (codeComments)) { -%>
         // define the dependencies

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-craftplugin",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "generator-craftplugin is a Yeoman generator for Craft CMS plugins",
   "main": "app/index.js",
   "files": [