Skip to content

Commit 4a71af3

Browse files
committed
Upgrade Ember to v3.15.1
1 parent 8bbe500 commit 4a71af3

File tree

6 files changed

+792
-342
lines changed

6 files changed

+792
-342
lines changed

.eslintrc.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,20 @@ module.exports = {
88
legacyDecorators: true
99
}
1010
},
11-
plugins: ['ember'],
12-
extends: ['eslint:recommended', 'plugin:ember/recommended'],
11+
plugins: ['ember', 'prettier'],
12+
extends: [
13+
'eslint:recommended',
14+
'plugin:ember/recommended',
15+
'plugin:prettier/recommended'
16+
],
1317
env: {
1418
browser: true
1519
},
1620
rules: {
1721
'ember/no-jquery': 'error',
1822
'ember/avoid-leaking-state-in-ember-objects': 'off',
19-
'no-console': 'off'
23+
'no-console': 'off',
24+
'prettier/prettier': 'warn'
2025
},
2126
overrides: [
2227
// node files

.template-lintrc.js

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

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane'
55
};

app/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

config/optional-features.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"application-template-wrapper": false,
3+
"default-async-observers": true,
34
"jquery-integration": false,
45
"template-only-glimmer-components": true
56
}

package.json

+22-18
Original file line numberDiff line numberDiff line change
@@ -27,46 +27,50 @@
2727
"lint:js": "eslint ."
2828
},
2929
"devDependencies": {
30-
"@ember/optional-features": "^1.0.0",
30+
"@ember/optional-features": "^1.1.0",
31+
"@glimmer/component": "^1.0.0",
3132
"babel-eslint": "^10.0.3",
3233
"broccoli-asset-rev": "^3.0.0",
3334
"corber": "1.4.2",
3435
"corber-ember-livereload": "^0.0.2",
35-
"ember-auto-import": "^1.5.2",
36-
"ember-cli": "~3.14.0",
36+
"ember-auto-import": "^1.5.3",
37+
"ember-cli": "~3.15.1",
3738
"ember-cli-app-version": "^3.2.0",
38-
"ember-cli-babel": "^7.11.1",
39-
"ember-cli-dependency-checker": "^3.1.0",
39+
"ember-cli-babel": "^7.13.0",
40+
"ember-cli-dependency-checker": "^3.2.0",
4041
"ember-cli-eslint": "^5.1.0",
41-
"ember-cli-htmlbars": "^4.0.5",
42+
"ember-cli-htmlbars": "^4.2.0",
4243
"ember-cli-inject-live-reload": "^2.0.1",
4344
"ember-cli-sass": "^10.0.1",
4445
"ember-cli-sri": "^2.1.1",
4546
"ember-cli-template-lint": "^1.0.0-beta.3",
4647
"ember-cli-uglify": "^3.0.0",
4748
"ember-concurrency": "^1.1.3",
48-
"ember-data": "~3.14.0",
49-
"ember-export-application-global": "^2.0.0",
50-
"ember-fetch": "^6.7.0",
49+
"ember-data": "~3.15.0",
50+
"ember-export-application-global": "^2.0.1",
51+
"ember-fetch": "^7.0.0",
5152
"ember-get-config": "^0.2.4",
52-
"ember-load-initializers": "^2.1.0",
53+
"ember-load-initializers": "^2.1.1",
5354
"ember-maybe-import-regenerator": "^0.1.6",
5455
"ember-prop-types": "^9.0.2",
55-
"ember-qunit": "^4.5.1",
56-
"ember-resolver": "^5.3.0",
57-
"ember-source": "~3.14.1",
56+
"ember-qunit": "^4.6.0",
57+
"ember-resolver": "^7.0.0",
58+
"ember-source": "~3.15.0",
5859
"ember-truth-helpers": "^2.1.0",
59-
"ember-welcome-page": "^4.0.0",
60-
"eslint-plugin-ember": "^7.1.0",
60+
"eslint-config-prettier": "^6.9.0",
61+
"eslint-plugin-ember": "^7.7.1",
6162
"eslint-plugin-node": "^10.0.0",
63+
"eslint-plugin-prettier": "^3.1.2",
64+
"git-rev-sync": "^1.12.0",
6265
"loader.js": "^4.7.0",
63-
"qunit-dom": "^0.9.0",
66+
"prettier": "^1.19.1",
67+
"qunit-dom": "^0.9.2",
6468
"sass": "^1.23.7"
6569
},
6670
"engines": {
6771
"node": "8.* || >= 10.*"
6872
},
69-
"dependencies": {
70-
"git-rev-sync": "^1.12.0"
73+
"ember": {
74+
"edition": "octane"
7175
}
7276
}

0 commit comments

Comments
 (0)