addon.js.diff

addon.js.diff

diff --git a/lib/models/addon.js b/lib/models/addon.js
index 115edffc..ecf9731f 100644
--- a/lib/models/addon.js
+++ b/lib/models/addon.js
@@ -298,6 +298,10 @@ let addonProto = {
       public: 'public',
     };
 
+    if (this.isModuleUnification()) {
+      this.treePaths.styles = 'src/ui/styles';
+    }
+
     this.treeForMethods = defaultsDeep({}, DEFAULT_TREE_FOR_METHODS);
 
     if (this.parent) {
@@ -814,7 +818,7 @@ let addonProto = {
     @return {Tree} App file tree
   */
   treeForApp(tree) {
-    if (!isExperimentEnabled('MODULE_UNIFICATION')) {
+    if (!this.project.isModuleUnification() && !this.isModuleUnification()) {
       return tree;
     } else if (this.project.isModuleUnification() && this.isModuleUnification()) {
       return null;
@@ -831,7 +835,7 @@ let addonProto = {
         namespace: this.name,
       });
 
-      return reexportedOutput;
+      return reexportedOutput;
     }
 
     return tree;
@@ -855,7 +859,7 @@ let addonProto = {
     @return
   */
   treeForSrc(rawSrcTree) {
-    if (!isExperimentEnabled('MODULE_UNIFICATION')) {
+    if (!this.isModuleUnification()) {
       return null;
     }
     if (!rawSrcTree) { return null; }