Skip to content

Commit 6a8c36e

Browse files
Ember 3.11
1 parent e35d179 commit 6a8c36e

File tree

6 files changed

+138
-104
lines changed

6 files changed

+138
-104
lines changed

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jobs:
5050
# we recommend new addons test the current and previous LTS
5151
# as well as latest stable release (bonus points to beta/canary)
5252
- stage: "Additional Tests"
53-
env: EMBER_TRY_SCENARIO=ember-lts-2.18
54-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
53+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
54+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
5555
- env: EMBER_TRY_SCENARIO=ember-release
5656
- env: EMBER_TRY_SCENARIO=ember-beta
5757
- env: EMBER_TRY_SCENARIO=ember-canary

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This addon allows you to configure your Netlify headers and redirects.
1717
Compatibility
1818
------------------------------------------------------------------------------
1919

20-
* Ember.js v2.18 or above
20+
* Ember.js v3.4 or above
2121
* Ember CLI v2.13 or above
2222
* Node.js v8 or above
2323

config/ember-try.js

Lines changed: 61 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2,82 +2,73 @@
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-
scenarios: [
13-
{
14-
name: 'ember-lts-2.18',
15-
env: {
16-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
17-
},
18-
npm: {
19-
devDependencies: {
20-
'@ember/jquery': '^0.5.1',
21-
'ember-source': '~2.18.0'
22-
}
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-lts-3.4',
11+
npm: {
12+
devDependencies: {
13+
'ember-source': '~3.4.0'
2314
}
24-
},
25-
{
26-
name: 'ember-lts-3.4',
27-
npm: {
28-
devDependencies: {
29-
'ember-source': '~3.4.0'
30-
}
31-
}
32-
},
33-
{
34-
name: 'ember-release',
35-
npm: {
36-
devDependencies: {
37-
'ember-source': urls[0]
38-
}
15+
}
16+
},
17+
{
18+
name: 'ember-lts-3.8',
19+
npm: {
20+
devDependencies: {
21+
'ember-source': '~3.8.0'
3922
}
40-
},
41-
{
42-
name: 'ember-beta',
43-
npm: {
44-
devDependencies: {
45-
'ember-source': urls[1]
46-
}
23+
}
24+
},
25+
{
26+
name: 'ember-release',
27+
npm: {
28+
devDependencies: {
29+
'ember-source': await getChannelURL('release')
4730
}
48-
},
49-
{
50-
name: 'ember-canary',
51-
npm: {
52-
devDependencies: {
53-
'ember-source': urls[2]
54-
}
31+
}
32+
},
33+
{
34+
name: 'ember-beta',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': await getChannelURL('beta')
5538
}
56-
},
57-
// The default `.travis.yml` runs this scenario via `yarn test`,
58-
// not via `ember try`. It's still included here so that running
59-
// `ember try:each` manually or from a customized CI config will run it
60-
// along with all the other scenarios.
61-
{
62-
name: 'ember-default',
63-
npm: {
64-
devDependencies: {}
39+
}
40+
},
41+
{
42+
name: 'ember-canary',
43+
npm: {
44+
devDependencies: {
45+
'ember-source': await getChannelURL('canary')
6546
}
47+
}
48+
},
49+
// The default `.travis.yml` runs this scenario via `yarn test`,
50+
// not via `ember try`. It's still included here so that running
51+
// `ember try:each` manually or from a customized CI config will run it
52+
// along with all the other scenarios.
53+
{
54+
name: 'ember-default',
55+
npm: {
56+
devDependencies: {}
57+
}
58+
},
59+
{
60+
name: 'ember-default-with-jquery',
61+
env: {
62+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
63+
'jquery-integration': true
64+
})
6665
},
67-
{
68-
name: 'ember-default-with-jquery',
69-
env: {
70-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
71-
'jquery-integration': true
72-
})
73-
},
74-
npm: {
75-
devDependencies: {
76-
'@ember/jquery': '^0.5.1'
77-
}
66+
npm: {
67+
devDependencies: {
68+
'@ember/jquery': '^0.5.1'
7869
}
7970
}
80-
]
81-
};
82-
});
71+
}
72+
]
73+
};
8374
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"devDependencies": {
3030
"@ember/optional-features": "^0.7.0",
3131
"broccoli-asset-rev": "^3.0.0",
32-
"ember-cli": "~3.10.1",
32+
"ember-cli": "~3.11.0",
3333
"ember-cli-babel": "^7.7.3",
3434
"ember-cli-dependency-checker": "^3.1.0",
3535
"ember-cli-eslint": "^5.1.0",
@@ -45,7 +45,7 @@
4545
"ember-maybe-import-regenerator": "^0.1.6",
4646
"ember-qunit": "^4.4.1",
4747
"ember-resolver": "^5.0.1",
48-
"ember-source": "~3.10.0",
48+
"ember-source": "~3.11.1",
4949
"ember-source-channel-url": "^1.1.0",
5050
"ember-try": "^1.0.0",
5151
"eslint-plugin-ember": "^6.2.0",

0 commit comments

Comments
 (0)