Skip to content

Commit 3dfa79f

Browse files
tniezurawskitniezurawski
committed
Bump Ember from 3.8 to 3.12
1 parent 302bd06 commit 3dfa79f

File tree

8 files changed

+594
-693
lines changed

8 files changed

+594
-693
lines changed

‎.eslintrc.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 2017,
4+
ecmaVersion: 2018,
55
sourceType: 'module'
66
},
77
plugins: [
@@ -36,8 +36,7 @@ module.exports = {
3636
'tests/dummy/app/**'
3737
],
3838
parserOptions: {
39-
sourceType: 'script',
40-
ecmaVersion: 2015
39+
sourceType: 'script'
4140
},
4241
env: {
4342
browser: false,

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "6"
6+
- "8"
77

88
sudo: required
99
dist: trusty
@@ -47,6 +47,7 @@ jobs:
4747
- env: EMBER_TRY_SCENARIO=ember-lts-2.16
4848
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
4949
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
5051
- env: EMBER_TRY_SCENARIO=ember-release
5152
- env: EMBER_TRY_SCENARIO=ember-beta
5253
- env: EMBER_TRY_SCENARIO=ember-canary

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ Compatibility
103103

104104
* Ember.js v2.12 or above
105105
* Ember CLI v2.12 or above
106+
* Node.js v8 or above
106107

107108
Contributing
108109
------------------------------------------------------------------------------

‎config/ember-try.js‎

Lines changed: 92 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2,107 +2,109 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
useYarn: true,
13-
scenarios: [
14-
{
15-
name: 'ember-lts-2.12',
16-
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
18-
},
19-
npm: {
20-
devDependencies: {
21-
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.12.0'
23-
}
24-
}
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-lts-2.12',
11+
env: {
12+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
2513
},
26-
{
27-
name: 'ember-lts-2.16',
28-
env: {
29-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
30-
},
31-
npm: {
32-
devDependencies: {
33-
'@ember/jquery': '^0.5.1',
34-
'ember-source': '~2.16.0'
35-
}
14+
npm: {
15+
devDependencies: {
16+
'@ember/jquery': '^0.5.1',
17+
'ember-source': '~2.12.0'
3618
}
19+
}
20+
},
21+
{
22+
name: 'ember-lts-2.16',
23+
env: {
24+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
3725
},
38-
{
39-
name: 'ember-lts-2.18',
40-
env: {
41-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
42-
},
43-
npm: {
44-
devDependencies: {
45-
'@ember/jquery': '^0.5.1',
46-
'ember-source': '~2.18.0'
47-
}
26+
npm: {
27+
devDependencies: {
28+
'@ember/jquery': '^0.5.1',
29+
'ember-source': '~2.16.0'
4830
}
31+
}
32+
},
33+
{
34+
name: 'ember-lts-2.18',
35+
env: {
36+
EMBER_OPTIONAL_FEATURES: JSON.stringify({'jquery-integration': true}),
4937
},
50-
{
51-
name: 'ember-lts-3.4',
52-
npm: {
53-
devDependencies: {
54-
'ember-source': '~3.4.0'
55-
}
38+
npm: {
39+
devDependencies: {
40+
'@ember/jquery': '^0.5.1',
41+
'ember-source': '~2.18.0'
5642
}
57-
},
58-
{
59-
name: 'ember-release',
60-
npm: {
61-
devDependencies: {
62-
'ember-source': urls[0]
63-
}
43+
}
44+
},
45+
{
46+
name: 'ember-lts-3.4',
47+
npm: {
48+
devDependencies: {
49+
'ember-source': '~3.4.0'
6450
}
65-
},
66-
{
67-
name: 'ember-beta',
68-
npm: {
69-
devDependencies: {
70-
'ember-source': urls[1]
71-
}
51+
}
52+
},
53+
{
54+
name: 'ember-lts-3.8',
55+
npm: {
56+
devDependencies: {
57+
'ember-source': '~3.8.0'
7258
}
73-
},
74-
{
75-
name: 'ember-canary',
76-
npm: {
77-
devDependencies: {
78-
'ember-source': urls[2]
79-
}
59+
}
60+
},
61+
{
62+
name: 'ember-release',
63+
npm: {
64+
devDependencies: {
65+
'ember-source': await getChannelURL('release')
8066
}
81-
},
82-
// The default `.travis.yml` runs this scenario via `npm test`,
83-
// not via `ember try`. It's still included here so that running
84-
// `ember try:each` manually or from a customized CI config will run it
85-
// along with all the other scenarios.
86-
{
87-
name: 'ember-default',
88-
npm: {
89-
devDependencies: {}
67+
}
68+
},
69+
{
70+
name: 'ember-beta',
71+
npm: {
72+
devDependencies: {
73+
'ember-source': await getChannelURL('beta')
9074
}
75+
}
76+
},
77+
{
78+
name: 'ember-canary',
79+
npm: {
80+
devDependencies: {
81+
'ember-source': await getChannelURL('canary')
82+
}
83+
}
84+
},
85+
// The default `.travis.yml` runs this scenario via `npm test`,
86+
// not via `ember try`. It's still included here so that running
87+
// `ember try:each` manually or from a customized CI config will run it
88+
// along with all the other scenarios.
89+
{
90+
name: 'ember-default',
91+
npm: {
92+
devDependencies: {}
93+
}
94+
},
95+
{
96+
name: 'ember-default-with-jquery',
97+
env: {
98+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
99+
'jquery-integration': true
100+
})
91101
},
92-
{
93-
name: 'ember-default-with-jquery',
94-
env: {
95-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
96-
'jquery-integration': true
97-
})
98-
},
99-
npm: {
100-
devDependencies: {
101-
'@ember/jquery': '^0.5.1'
102-
}
102+
npm: {
103+
devDependencies: {
104+
'@ember/jquery': '^0.5.1'
103105
}
104106
}
105-
]
106-
};
107-
});
107+
}
108+
]
109+
};
108110
};

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
"test:all": "ember try:each"
2828
},
2929
"dependencies": {
30-
"ember-cli-babel": "^7.1.2",
30+
"ember-cli-babel": "^7.7.3",
3131
"ember-notify-property-change-polyfill": "^0.0.1"
3232
},
3333
"devDependencies": {
34-
"@ember/optional-features": "^0.6.3",
35-
"broccoli-asset-rev": "^2.7.0",
36-
"ember-cli": "~3.8.3",
34+
"@ember/optional-features": "^0.7.0",
35+
"broccoli-asset-rev": "^3.0.0",
36+
"ember-cli": "~3.12.0",
3737
"ember-cli-dependency-checker": "^3.1.0",
38-
"ember-cli-eslint": "^4.2.3",
39-
"ember-cli-htmlbars": "^3.0.0",
40-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
38+
"ember-cli-eslint": "^5.1.0",
39+
"ember-cli-htmlbars": "^3.0.1",
40+
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
4141
"ember-cli-inject-live-reload": "^1.8.2",
4242
"ember-cli-release": "^1.0.0-beta.2",
4343
"ember-cli-sri": "^2.1.1",
@@ -46,20 +46,20 @@
4646
"ember-cli-update": "^0.45.0",
4747
"ember-disable-prototype-extensions": "^1.1.3",
4848
"ember-export-application-global": "^2.0.0",
49-
"ember-load-initializers": "^1.1.0",
49+
"ember-load-initializers": "^2.0.0",
5050
"ember-maybe-import-regenerator": "^0.1.6",
51-
"ember-qunit": "^3.4.1",
51+
"ember-qunit": "^4.4.1",
5252
"ember-resolver": "^5.0.1",
53-
"ember-source": "~3.8.0",
53+
"ember-source": "~3.12.0",
5454
"ember-source-channel-url": "^1.1.0",
5555
"ember-try": "^1.0.0",
56-
"eslint-plugin-ember": "^5.2.0",
57-
"eslint-plugin-node": "^7.0.1",
56+
"eslint-plugin-ember": "^6.2.0",
57+
"eslint-plugin-node": "^9.0.1",
5858
"loader.js": "^4.7.0",
59-
"qunit-dom": "^0.8.0"
59+
"qunit-dom": "^0.8.4"
6060
},
6161
"engines": {
62-
"node": "6.* || 8.* || >= 10.*"
62+
"node": "8.* || >= 10.*"
6363
},
6464
"ember-addon": {
6565
"configPath": "tests/dummy/config"

‎testem.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module.exports = {
1313
// --no-sandbox is needed when running Chrome inside a container
1414
process.env.CI ? '--no-sandbox' : null,
1515
'--headless',
16-
'--disable-gpu',
1716
'--disable-dev-shm-usage',
1817
'--mute-audio',
1918
'--remote-debugging-port=0',

‎tests/dummy/config/environment.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = function(environment) {
99
EmberENV: {
1010
FEATURES: {
1111
// Here you can enable experimental features on an ember canary build
12-
// e.g. 'with-controller': true
12+
// e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
1313
},
1414
EXTEND_PROTOTYPES: {
1515
// Prevent Ember Data from overriding Date.parse.

0 commit comments

Comments
 (0)