--no-welcome is not supported for ember-addon

Author: Kelly Selden

src/get-project-options.js

@@ -56,10 +56,13 @@ module.exports = async function getProjectOptions({
     options.push('yarn');
   }
 
-  let hasWelcome = checkForDep('ember-welcome-page');
+  // addons don't support the welcome option
+  if (projectType === 'app') {
+    let hasWelcome = checkForDep('ember-welcome-page');
 
-  if (hasWelcome) {
-    options.push('welcome');
+    if (hasWelcome) {
+      options.push('welcome');
+    }
   }
 
   return options;

src/load-safe-default-blueprint.js

@@ -10,7 +10,7 @@ function loadSafeDefaultBlueprint(projectOptions, version) {
   if (projectOptions.includes('yarn')) {
     options.push('--yarn');
   }
-  if (!projectOptions.includes('welcome')) {
+  if (!projectOptions.includes('welcome') && !projectOptions.includes('addon')) {
     options.push('--no-welcome');
   }
 

test/integration/load-safe-default-blueprint-test.js

@@ -22,61 +22,66 @@ describe(_loadSafeDefaultBlueprint, function() {
       projectOptions.push('app');
     });
 
-    it('npm, welcome', async function() {
-      projectOptions.push('welcome');
-
-      let blueprint = loadSafeDefaultBlueprint();
-
-      expect(blueprint).to.deep.equal({
-        name: 'ember-cli',
-        type: 'app',
-        version,
-        options: []
+    describe('welcome', function() {
+      beforeEach(function() {
+        projectOptions.push('welcome');
       });
-    });
 
-    it('npm, no welcome', async function() {
-      let blueprint = loadSafeDefaultBlueprint();
+      it('npm', async function() {
+        let blueprint = loadSafeDefaultBlueprint();
 
-      expect(blueprint).to.deep.equal({
-        name: 'ember-cli',
-        type: 'app',
-        version,
-        options: [
-          '--no-welcome'
-        ]
+        expect(blueprint).to.deep.equal({
+          name: 'ember-cli',
+          type: 'app',
+          version,
+          options: []
+        });
       });
-    });
 
-    it('yarn, welcome', async function() {
-      projectOptions.push('yarn');
-      projectOptions.push('welcome');
+      it('yarn', async function() {
+        projectOptions.push('yarn');
 
-      let blueprint = loadSafeDefaultBlueprint();
+        let blueprint = loadSafeDefaultBlueprint();
 
-      expect(blueprint).to.deep.equal({
-        name: 'ember-cli',
-        type: 'app',
-        version,
-        options: [
-          '--yarn'
-        ]
+        expect(blueprint).to.deep.equal({
+          name: 'ember-cli',
+          type: 'app',
+          version,
+          options: [
+            '--yarn'
+          ]
+        });
       });
     });
 
-    it('yarn, no welcome', async function() {
-      projectOptions.push('yarn');
+    describe('no welcome', function() {
+      it('npm', async function() {
+        let blueprint = loadSafeDefaultBlueprint();
+
+        expect(blueprint).to.deep.equal({
+          name: 'ember-cli',
+          type: 'app',
+          version,
+          options: [
+            '--no-welcome'
+          ]
+        });
+      });
 
-      let blueprint = loadSafeDefaultBlueprint();
+      it('yarn', async function() {
+        projectOptions.push('yarn');
 
-      expect(blueprint).to.deep.equal({
-        name: 'ember-cli',
-        type: 'app',
-        version,
-        options: [
-          '--yarn',
-          '--no-welcome'
-        ]
+        let blueprint = loadSafeDefaultBlueprint();
+
+        expect(blueprint).to.deep.equal({
+          name: 'ember-cli',
+          type: 'app',
+          version,
+          options: [
+            '--yarn',
+            '--no-welcome'
+          ]
+        });
       });
     });
   });
@@ -86,9 +91,7 @@ describe(_loadSafeDefaultBlueprint, function() {
       projectOptions.push('addon');
     });
 
-    it('npm, welcome', async function() {
-      projectOptions.push('welcome');
-
+    it('npm', async function() {
       let blueprint = loadSafeDefaultBlueprint();
 
       expect(blueprint).to.deep.equal({
@@ -99,22 +102,8 @@ describe(_loadSafeDefaultBlueprint, function() {
       });
     });
 
-    it('npm, no welcome', async function() {
-      let blueprint = loadSafeDefaultBlueprint();
-
-      expect(blueprint).to.deep.equal({
-        name: 'ember-cli',
-        type: 'addon',
-        version,
-        options: [
-          '--no-welcome'
-        ]
-      });
-    });
-
-    it('yarn, welcome', async function() {
+    it('yarn', async function() {
       projectOptions.push('yarn');
-      projectOptions.push('welcome');
 
       let blueprint = loadSafeDefaultBlueprint();
 
@@ -127,21 +116,5 @@ describe(_loadSafeDefaultBlueprint, function() {
         ]
       });
     });
-
-    it('yarn, no welcome', async function() {
-      projectOptions.push('yarn');
-
-      let blueprint = loadSafeDefaultBlueprint();
-
-      expect(blueprint).to.deep.equal({
-        name: 'ember-cli',
-        type: 'addon',
-        version,
-        options: [
-          '--yarn',
-          '--no-welcome'
-        ]
-      });
-    });
   });
 });

test/unit/get-project-options-test.js

@@ -128,7 +128,7 @@ describe(_getProjectOptions, function() {
       expect(await getProjectOptions()).to.deep.equal(['addon']);
     });
 
-    it('detects welcome option', async function() {
+    it('doesn\'t detect welcome option', async function() {
       packageJson = {
         keywords: [
           'ember-addon'
@@ -139,7 +139,7 @@ describe(_getProjectOptions, function() {
         }
       };
 
-      expect(await getProjectOptions()).to.deep.equal(['addon', 'welcome']);
+      expect(await getProjectOptions()).to.deep.equal(['addon']);
     });
 
     it('detects yarn option', async function() {