Merge pull request #7768 from GavinJoyce/gj/dont-consider-using-defau…

…lt-addon-import-if-mu Don't try to use default addon-import if app is MU
ember-cli · Apr 18, 2018 · f724919 · f724919
2 parents 2468d54 + d86e69f
commit f724919
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/tasks/generate-from-blueprint.js b/lib/tasks/generate-from-blueprint.js
@@ -25,14 +25,14 @@ class GenerateTask extends Task {
     let addonBlueprint;
     if (isNotModuleUnification) {
       addonBlueprint = this.lookupBlueprint(`${name}-addon`, true);
-    }
 
-    // otherwise, use default addon-import
-    if (noAddonBlueprint.indexOf(name) < 0 && !addonBlueprint && options.args[1]) {
-      let mainBlueprintSupportsAddon = mainBlueprint && mainBlueprint.supportsAddon() && isNotModuleUnification;
+      // otherwise, use default addon-import
+      if (noAddonBlueprint.indexOf(name) < 0 && !addonBlueprint && options.args[1]) {
+        let mainBlueprintSupportsAddon = mainBlueprint && mainBlueprint.supportsAddon() && isNotModuleUnification;
 
-      if (mainBlueprintSupportsAddon) {
-        addonBlueprint = this.lookupBlueprint('addon-import', true);
+        if (mainBlueprintSupportsAddon) {
+          addonBlueprint = this.lookupBlueprint('addon-import', true);
+        }
       }
     }