Skip to content

Commit d340fa7

Browse files
committed
update to 3.28 with ember-cli-update
1 parent ac87c80 commit d340fa7

8 files changed

+967
-991
lines changed

.eslintignore

+1
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

+17-11
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,18 @@ module.exports = {
3333
// node files
3434
{
3535
files: [
36-
'.eslintrc.js',
37-
'.prettierrc.js',
38-
'.template-lintrc.js',
39-
'ember-cli-build.js',
40-
'testem.js',
41-
'run-tests.js',
42-
'blueprints/*/index.js',
43-
'config/**/*.js',
44-
'lib/**/*.js',
45-
'bin/*',
46-
'server/**/*.js',
36+
'./.eslintrc.js',
37+
'./.prettierrc.js',
38+
'./.template-lintrc.js',
39+
'./ember-cli-build.js',
40+
'./testem.js',
41+
'./blueprints/*/index.js',
42+
'./config/**/*.js',
43+
'./lib/*/index.js',
44+
'./server/**/*.js',
45+
'./run-tests.js',
46+
'./bin/*',
47+
'./prember-urls.js',
4748
],
4849
excludedFiles: ['config/deprecation-workflow.js'],
4950
parserOptions: {
@@ -62,5 +63,10 @@ module.exports = {
6263
'node/no-unpublished-require': 'off',
6364
},
6465
},
66+
{
67+
// Test files:
68+
files: ['tests/**/*-test.{js,ts}'],
69+
extends: ['plugin:qunit/recommended'],
70+
},
6571
],
6672
};

.template-lintrc.js

+1-11
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,5 @@
22
'use strict';
33

44
module.exports = {
5-
extends: 'octane',
6-
rules: {
7-
'attribute-indentation': false,
8-
'no-unnecessary-concat': false,
9-
'no-inline-styles': false,
10-
'no-curly-component-invocation': false,
11-
'no-action': false,
12-
quotes: false,
13-
'no-link-to-positional-params': false,
14-
'require-input-label': false,
15-
},
5+
extends: 'recommended',
166
};

config/ember-cli-update.json

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

config/targets.js

+14-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,20 @@ const browsers = [
77
'last 1 Edge versions',
88
];
99

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

1725
module.exports = {
1826
browsers,

0 commit comments

Comments
 (0)