From 782d69bdb9732b79c11c05ab260a4c2cfd32a6d4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 16 Sep 2019 13:26:05 -0700
Subject: [PATCH] [BUGFIX beta] Disable co-location in blueprints

The supporting code in `ember-cli-htmlbars` required to make this
work is currently gated behind the Octane flag.
---
 blueprints/component/index.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index c43c8303bc5..6971aabb502 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -42,9 +42,9 @@ module.exports = {
     },
     {
       name: 'component-structure',
-      type: ['flat', 'nested', 'classic'],
+      type: OCTANE ? ['flat', 'nested', 'classic'] : ['classic'],
       default: OCTANE ? 'flat' : 'classic',
-      aliases: [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }],
+      aliases: OCTANE ? [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }] : [{ cs: 'classic' }],
     },
   ],
 
@@ -60,7 +60,15 @@ module.exports = {
           option.default = '@ember/component';
         }
       } else if (option.name === 'component-structure') {
-        option.default = isOctane ? 'flat' : 'classic';
+        if (isOctane) {
+          option.type = ['flat', 'nested', 'classic'];
+          option.default = 'flat';
+          option.aliases = [{ fs: 'flat' }, { ns: 'nested' }, { cs: 'classic' }];
+        } else {
+          option.type = ['classic'];
+          option.default = 'classic';
+          option.aliases = [{ cs: 'classic' }];
+        }
       }
     });