Skip to content

Commit c4a171b

Browse files
Merge pull request #153 from ember-cli/welcomepage-extension
Pass extension to WelcomePage component
2 parents 8d0a4ce + 6bca28c commit c4a171b

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

files/app/templates/application.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { pageTitle } from 'ember-page-title';
77
{{outlet}}
88

99
{{! The following component displays Ember's default welcome message. }}
10-
<WelcomePage />
10+
<WelcomePage @extension="<% if (typescript) {%>gts<% } else { %>gjs<% } %>" />
1111
{{! Feel free to remove this! }}<% } else { %>
1212
<h2 id="title">Welcome to Ember</h2>
1313

files/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"ember-resolver": "^13.1.1",
7575
"ember-source": "~6.10.0-alpha.1",
7676
"ember-template-lint": "^7.9.3<% if (welcome) { %>",
77-
"ember-welcome-page": "^7.0.2<% } %>",
77+
"ember-welcome-page": "^8.0.4<% } %>",
7878
"eslint": "^9.37.0",
7979
"eslint-config-prettier": "^10.1.8",
8080
"eslint-plugin-ember": "^12.7.4",

tests/arguments.test.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ describe('Blueprint Arguments', function () {
154154
expect(parse(files['package.json']).devDependencies['ember-welcome-page'])
155155
.to.not.be.undefined;
156156
expect(files.app.templates['application.gjs']).to.contain(
157-
'<WelcomePage />',
157+
'<WelcomePage @extension="gjs" />',
158158
);
159159
});
160160

@@ -164,7 +164,7 @@ describe('Blueprint Arguments', function () {
164164
expect(parse(files['package.json']).devDependencies['ember-welcome-page'])
165165
.to.be.undefined;
166166
expect(files.app.templates['application.gjs']).not.to.contain(
167-
'<WelcomePage />',
167+
'<WelcomePage @extension="gjs" />',
168168
);
169169
});
170170
});

tests/fixtures/tests-js-10/app/templates/application.gjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { LinkTo } from '@ember/routing';
88
{{outlet}}
99

1010
{{! The following component displays Ember's default welcome message. }}
11-
<WelcomePage />
11+
<WelcomePage @extension="gjs" />
1212
{{! Feel free to remove this! }}
1313

1414
<LinkTo @route="fancy" data-test-a>Fancy</LinkTo>

tests/fixtures/tests-ts-10/app/templates/application.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { LinkTo } from '@ember/routing';
88
{{outlet}}
99

1010
{{! The following component displays Ember's default welcome message. }}
11-
<WelcomePage />
11+
<WelcomePage @extension="gts" />
1212
{{! Feel free to remove this! }}
1313

1414
<LinkTo @route="fancy" data-test-a>Fancy</LinkTo>

0 commit comments

Comments
 (0)