Skip to content

Commit f561479

Browse files
authored
Merge pull request #287 from ember-learn/update
update to v3.28 with ember-cli-update and update to latest template
2 parents 93267fc + 98e15da commit f561479

File tree

8 files changed

+22759
-23987
lines changed

8 files changed

+22759
-23987
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ module.exports = {
2424
// node files
2525
{
2626
files: [
27-
'.eslintrc.js',
28-
'.prettierrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'testem.js',
32-
'blueprints/*/index.js',
33-
'config/**/*.js',
34-
'lib/*/index.js',
35-
'server/**/*.js',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./testem.js',
32+
'./blueprints/*/index.js',
33+
'./config/**/*.js',
34+
'./lib/*/index.js',
35+
'./server/**/*.js',
3636
],
3737
parserOptions: {
3838
sourceType: 'script',
@@ -49,5 +49,10 @@ module.exports = {
4949
'node/no-unpublished-require': 'off',
5050
},
5151
},
52+
{
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
5257
],
5358
};

app/styles/app.css

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +0,0 @@
1-
code {
2-
color: #212121;
3-
}
4-
a.edit-page {
5-
text-decoration: none;
6-
}
7-
8-
th.col-32 {
9-
width: 32%;
10-
}

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.24.0",
6+
"version": "3.28.6",
77
"blueprints": [
88
{
99
"name": "app",

config/targets.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@ const browsers = [
66
'last 1 Safari versions',
77
];
88

9-
const isCI = Boolean(process.env.CI);
10-
const isProduction = process.env.EMBER_ENV === 'production';
11-
12-
if (isCI || isProduction) {
13-
browsers.push('ie 11');
14-
}
9+
// Ember's browser support policy is changing, and IE11 support will end in
10+
// v4.0 onwards.
11+
//
12+
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
13+
//
14+
// If you need IE11 support on a version of Ember that still offers support
15+
// for it, uncomment the code block below.
16+
//
17+
// const isCI = Boolean(process.env.CI);
18+
// const isProduction = process.env.EMBER_ENV === 'production';
19+
//
20+
// if (isCI || isProduction) {
21+
// browsers.push('ie 11');
22+
// }
1523

1624
module.exports = {
1725
browsers,

0 commit comments

Comments
 (0)