Skip to content

Commit ca63e0b

Browse files
authored
Merge pull request #860 from ember-learn/update-ember
update to 3.28 with ember-cli-update
2 parents ac87c80 + 0530ab3 commit ca63e0b

23 files changed

+1498
-1078
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: 17 additions & 11 deletions
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

Lines changed: 1 addition & 11 deletions
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
};

app/components/search-input.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{! template-lint-disable no-action }}
12
<div class='search-input'>
23
<input
34
id='search-input'

app/controllers/project-version.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ export default class ProjectVersionController extends Controller {
9696
@computed('metaStore.availableProjectVersions', 'model.project.id')
9797
get projectVersions() {
9898
const projectVersions =
99-
this.metaStore.availableProjectVersions[this.model.project.get('id')];
99+
this.metaStore.availableProjectVersions[
100+
this.model.belongsTo('project').id()
101+
];
100102
let versions = projectVersions.sort((a, b) => semverCompare(b, a));
101103

102104
versions = versions.map((version) => {

app/models/missing.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import Model, { attr } from '@ember-data/model';
1+
import Class from './class';
22

3-
export default class Missing extends Model {
4-
@attr()
5-
name;
6-
}
3+
export default class Missing extends Class {}

app/templates/ember-cli.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{! template-lint-disable no-inline-styles }}
12
{{!-- Template is copied from project-version.hbs --}}
23
<aside class="sidebar">
34
<ol class="toc-level-0">

app/templates/methods.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{! template-lint-disable no-action }}
12
<EmberAnchor @a={{this.anchor}} />
23
<ApiIndexFilter @model={{this.model}} @filterData={{this.filterData}} as |filteredModel|>
34
{{#each filteredModel.methods as |method|}}

app/templates/project-version.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{! template-lint-disable no-inline-styles }}
12
<aside class="sidebar">
23
<ol class="toc-level-0">
34
<li class="toc-level-0" data-test-home>

app/templates/project-version/classes/class.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{! template-lint-disable no-action }}
12
<article class="chapter">
23
{{#if (is-latest version=@model.projectVersion.version allVersions=this.allVersions)}}
34
<a data-tooltip="Edit on Github" class="heading__link__edit" href="{{github-link @model.project.id @model.projectVersion.version @model.file @model.line isEdit=true}}" target="_blank" rel="noopener noreferrer">{{svg-jar "fa-pencil"}}</a>

app/templates/properties.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{! template-lint-disable no-action }}
12
<EmberAnchor @a={{this.anchor}} />
23
<ApiIndexFilter @model={{this.model}} @filterData={{this.filterData}} as |filteredModel|>
34
{{#each filteredModel.properties as |property|}}

config/deprecation-workflow.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
self.deprecationWorkflow = self.deprecationWorkflow || {};
22
self.deprecationWorkflow.config = {
33
workflow: [
4-
{ handler: 'silence', matchId: 'ember.globals-resolver' },
5-
{ handler: 'silence', matchId: 'ember-component.is-visible' },
4+
{ handler: 'silence', matchId: 'ember-global' },
5+
{ handler: 'silence', matchId: 'ember.component.reopen' },
6+
{ handler: 'silence', matchId: 'implicit-injections' },
67
{ handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
78
{ handler: 'silence', matchId: 'this-property-fallback' },
9+
{ handler: 'silence', matchId: 'ember-component.is-visible' },
10+
{
11+
handler: 'silence',
12+
matchId: 'deprecated-run-loop-and-computed-dot-access',
13+
},
814
],
915
};

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.26.1",
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
@@ -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)