Repository: ember-cli/ember-cli
Pull request #8383 (2019-01-24 15:45:32)

Update `ember-welcome-page` usage to angle brackets

rwjblue: Need to update the fixtures here:

https://github.com/ember-cli/ember-cli/blob/94a678276a96794e3196c8e71c7fc2a76e8dd617/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs#L2

https://github.com/ember-cli/ember-cli/blob/94a678276a96794e3196c8e71c7fc2a76e8dd617/tests/fixtures/app/yarn/app/templates/application.hbs#L2
stefanpenner: fancy
ppcano: <img width="910" alt="screen shot 2019-01-27 at 6 50 56 am" src="https://user-images.githubusercontent.com/825430/51797235-fad2b200-21ff-11e9-8de7-60455c561a49.png">

The `ember-welcome-page` project should also change its copy:

remove the `<WelcomePage />` component from your `application.hbs`

Note: MU apps defines the template at `ui/routes/application/template.hbs`.


rwjblue: Great point @ppcano! Mind tweaking the addon to change the copy? With a stretch goal of possibly keeping `{{welcome-page}}` displayed for Ember < 3.4 and detecting MU to display the correct location...
rwjblue: ping @locks - mind updating the fixtures I linked to?
locks: On it!

Patch:
diff --git a/blueprints/app/files/app/templates/application.hbs b/blueprints/app/files/app/templates/application.hbs
index 347236121..e7e67e966 100644
--- a/blueprints/app/files/app/templates/application.hbs
+++ b/blueprints/app/files/app/templates/application.hbs
@@ -1,5 +1,5 @@
 <% if (welcome) { %>{{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
+<WelcomePage />
 {{!-- Feel free to remove this! --}}
 <% } else { %><h2 id="title">Welcome to Ember</h2>
 <% } %>
diff --git a/blueprints/module-unification-app/files/src/ui/routes/application/template.hbs b/blueprints/module-unification-app/files/src/ui/routes/application/template.hbs
index 347236121..e7e67e966 100644
--- a/blueprints/module-unification-app/files/src/ui/routes/application/template.hbs
+++ b/blueprints/module-unification-app/files/src/ui/routes/application/template.hbs
@@ -1,5 +1,5 @@
 <% if (welcome) { %>{{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
+<WelcomePage />
 {{!-- Feel free to remove this! --}}
 <% } else { %><h2 id="title">Welcome to Ember</h2>
 <% } %>


Test patch:
diff --git a/tests/acceptance/new-test.js b/tests/acceptance/new-test.js
index 21776f384..df2a25c3f 100644
--- a/tests/acceptance/new-test.js
+++ b/tests/acceptance/new-test.js
@@ -84,7 +84,7 @@ describe('Acceptance: ember new', function() {
       : "app/templates/application.hbs";
 
     expect(file(filePath))
-      .to.contain("{{welcome-page}}");
+      .to.contain("<WelcomePage />");
   }));
 
   it('ember new --no-welcome skips installation of ember-welcome-page', co.wrap(function *() {
diff --git a/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs b/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs
index 1eac0a203..7b1b1040f 100644
--- a/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs
+++ b/tests/fixtures/addon/yarn/tests/dummy/app/templates/application.hbs
@@ -1,5 +1,5 @@
 {{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
+<WelcomePage />
 {{!-- Feel free to remove this! --}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/tests/fixtures/app/yarn/app/templates/application.hbs b/tests/fixtures/app/yarn/app/templates/application.hbs
index 1eac0a203..7b1b1040f 100644
--- a/tests/fixtures/app/yarn/app/templates/application.hbs
+++ b/tests/fixtures/app/yarn/app/templates/application.hbs
@@ -1,5 +1,5 @@
 {{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
+<WelcomePage />
 {{!-- Feel free to remove this! --}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/tests/fixtures/module-unification-addon/yarn/tests/dummy/src/ui/routes/application/template.hbs b/tests/fixtures/module-unification-addon/yarn/tests/dummy/src/ui/routes/application/template.hbs
index 1eac0a203..7b1b1040f 100644
--- a/tests/fixtures/module-unification-addon/yarn/tests/dummy/src/ui/routes/application/template.hbs
+++ b/tests/fixtures/module-unification-addon/yarn/tests/dummy/src/ui/routes/application/template.hbs
@@ -1,5 +1,5 @@
 {{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
+<WelcomePage />
 {{!-- Feel free to remove this! --}}
 
 {{outlet}}
\ No newline at end of file
diff --git a/tests/fixtures/module-unification-app/yarn/src/ui/routes/application/template.hbs b/tests/fixtures/module-unification-app/yarn/src/ui/routes/application/template.hbs
index 1eac0a203..7b1b1040f 100644
--- a/tests/fixtures/module-unification-app/yarn/src/ui/routes/application/template.hbs
+++ b/tests/fixtures/module-unification-app/yarn/src/ui/routes/application/template.hbs
@@ -1,5 +1,5 @@
 {{!-- The following component displays Ember's default welcome message. --}}
-{{welcome-page}}
+<WelcomePage />
 {{!-- Feel free to remove this! --}}
 
 {{outlet}}
\ No newline at end of file