Skip to content

Commit 7253281

Browse files
committed
fix: drop node 6 and test Ember 3.4+
BREAKING CHANGE: Drop node 6 support and Ember < 3.4 Might still work on <3.4 but untested
1 parent 5d37d8c commit 7253281

8 files changed

Lines changed: 95 additions & 115 deletions

File tree

.eslintrc.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
},
55
root: true,
66
parserOptions: {
7-
ecmaVersion: 2017,
7+
ecmaVersion: 2018,
88
sourceType: 'module'
99
},
1010
plugins: [
@@ -40,8 +40,7 @@ module.exports = {
4040
'tests/dummy/app/**'
4141
],
4242
parserOptions: {
43-
sourceType: 'script',
44-
ecmaVersion: 2015
43+
sourceType: 'script'
4544
},
4645
env: {
4746
browser: false,

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
1416
/coverage/

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
1415
/.gitignore

.travis.yml

Lines changed: 3 additions & 11 deletions
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: false
99
dist: trusty
@@ -43,20 +43,12 @@ jobs:
4343
# we recommend new addons test the current and previous LTS
4444
# as well as latest stable release (bonus points to beta/canary)
4545
- stage: "Additional Tests"
46-
env: EMBER_TRY_SCENARIO=ember-lts-2.16
47-
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
48-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
46+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
47+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
4948
- env: EMBER_TRY_SCENARIO=ember-release
5049
- env: EMBER_TRY_SCENARIO=ember-beta
5150
- env: EMBER_TRY_SCENARIO=ember-canary
5251
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5352

54-
before_install:
55-
- curl -o- -L https://yarnpkg.com/install.sh | bash
56-
- export PATH=$HOME/.yarn/bin:$PATH
57-
58-
install:
59-
- yarn install --no-lockfile --non-interactive --ignore-engines
60-
6153
script:
6254
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
A convention-based version update notifier. Use it to notify users already on the page that a new version has been deployed.
66

7+
## Compatibility
8+
9+
* Ember.js v3.4 or above
10+
* Ember CLI v2.13 or above
11+
* Node.js v8 or above
12+
713
## Usage
814

915
1. Add this add-on as you would any other:
@@ -98,9 +104,11 @@ let app = new EmberApp(defaults, {
98104
});
99105
```
100106

101-
## Contributing
107+
Contributing
108+
------------------------------------------------------------------------------
109+
110+
See the [Contributing](CONTRIBUTING.md) guide for details.
102111

103-
See the [Contributing](CONTRIBUTING.md) guide.
104112

105113
License
106114
------------------------------------------------------------------------------

config/ember-try.js

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

package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
"release": "standard-version"
1313
},
1414
"engines": {
15-
"node": "6.* || 8.* || >= 10.*"
15+
"node": "8.* || >= 10.*"
1616
},
1717
"devDependencies": {
18-
"@ember/optional-features": "^0.6.3",
19-
"broccoli-asset-rev": "^2.7.0",
20-
"ember-cli": "~3.6.1",
21-
"ember-cli-dependency-checker": "^3.0.0",
22-
"ember-cli-eslint": "^4.2.3",
23-
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
18+
"@ember/optional-features": "^0.7.0",
19+
"broccoli-asset-rev": "^3.0.0",
20+
"ember-cli": "~3.11.0",
21+
"ember-cli-dependency-checker": "^3.1.0",
22+
"ember-cli-eslint": "^5.1.0",
23+
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
2424
"ember-cli-inject-live-reload": "^1.8.2",
2525
"ember-cli-mirage": "^0.4.1",
2626
"ember-cli-sri": "^2.1.1",
@@ -29,20 +29,20 @@
2929
"ember-concurrency-test-waiter": "^0.3.1",
3030
"ember-disable-prototype-extensions": "^1.1.3",
3131
"ember-export-application-global": "^2.0.0",
32-
"ember-load-initializers": "^1.1.0",
32+
"ember-fetch": "^6.4.0",
33+
"ember-load-initializers": "^2.0.0",
3334
"ember-maybe-import-regenerator": "^0.1.6",
34-
"ember-qunit": "^3.4.1",
35+
"ember-qunit": "^4.4.1",
3536
"ember-resolver": "^5.0.1",
36-
"ember-source": "~3.6.0",
37+
"ember-source": "~3.11.1",
3738
"ember-source-channel-url": "^1.1.0",
3839
"ember-try": "^1.0.0",
39-
"eslint-plugin-ember": "^5.2.0",
40-
"eslint-plugin-node": "^7.0.1",
40+
"eslint-plugin-ember": "^6.2.0",
41+
"eslint-plugin-node": "^9.0.1",
4142
"loader.js": "^4.7.0",
4243
"mirage": "0.0.7",
43-
"qunit-dom": "^0.8.0",
44-
"standard-version": "^4.4.0",
45-
"ember-fetch": "^6.4.0"
44+
"qunit-dom": "^0.8.4",
45+
"standard-version": "^4.4.0"
4646
},
4747
"keywords": [
4848
"ember-addon",
@@ -63,7 +63,7 @@
6363
},
6464
"dependencies": {
6565
"broccoli-file-creator": "^2.1.1",
66-
"ember-cli-babel": "^7.1.2",
66+
"ember-cli-babel": "^7.7.3",
6767
"ember-cli-htmlbars": "^3.0.1",
6868
"ember-concurrency": "^0.8.26 || ^0.9.0"
6969
},

tests/dummy/config/environment.js

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

0 commit comments

Comments
 (0)