Skip to content

Commit 7604274

Browse files
committed
Upgrading dependencies
1 parent 2d33268 commit 7604274

20 files changed

+2631
-1453
lines changed

.eslintrc.js

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,48 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 6,
4+
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'index.js',
24+
'testem.js',
25+
'ember-cli-build.js',
26+
'config/**/*.js',
27+
'tests/dummy/config/**/*.js'
28+
],
29+
excludedFiles: [
30+
'app/**',
31+
'addon/**',
32+
'tests/dummy/app/**'
33+
],
34+
parserOptions: {
35+
sourceType: 'script',
36+
ecmaVersion: 2015
37+
},
38+
env: {
39+
browser: false,
40+
node: true
41+
},
42+
plugins: ['node'],
43+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
44+
// add your custom rules and overrides for node files here
45+
})
46+
}
47+
]
1348
};

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
npm-debug.log*
17+
yarn-error.log
1718
testem.log
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
.bowerrc
88
.editorconfig
99
.ember-cli
10-
.gitignore
1110
.eslintrc.js
11+
.gitignore
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
18+
# ember-try
19+
.node_modules.ember-try/
20+
bower.json.ember-try
21+
package.json.ember-try

.travis.yml

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
11
---
22
language: node_js
33
node_js:
4-
- "6"
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
6+
- "4"
57

68
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
713

814
cache:
9-
directories:
10-
- $HOME/.npm
11-
- $HOME/.cache # includes bowers cache
15+
yarn: true
1216

1317
env:
14-
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
15-
- EMBER_TRY_SCENARIO=ember-lts-2.4
16-
- EMBER_TRY_SCENARIO=ember-lts-2.8
17-
- EMBER_TRY_SCENARIO=ember-release
18-
- EMBER_TRY_SCENARIO=ember-beta
19-
- EMBER_TRY_SCENARIO=ember-canary
20-
- EMBER_TRY_SCENARIO=ember-default
18+
global:
19+
# See https://git.io/vdao3 for details.
20+
- JOBS=1
21+
matrix:
22+
# we recommend new addons test the current and previous LTS
23+
# as well as latest stable release (bonus points to beta/canary)
24+
- EMBER_TRY_SCENARIO=ember-lts-2.12
25+
- EMBER_TRY_SCENARIO=ember-lts-2.16
26+
- EMBER_TRY_SCENARIO=ember-lts-2.18
27+
- EMBER_TRY_SCENARIO=ember-release
28+
- EMBER_TRY_SCENARIO=ember-beta
29+
- EMBER_TRY_SCENARIO=ember-canary
30+
- EMBER_TRY_SCENARIO=ember-default
2131

2232
matrix:
2333
fast_finish: true
2434
allow_failures:
2535
- env: EMBER_TRY_SCENARIO=ember-canary
2636

2737
before_install:
28-
- npm config set spin false
29-
- npm install -g phantomjs-prebuilt
30-
- phantomjs --version
38+
- curl -o- -L https://yarnpkg.com/install.sh | bash
39+
- export PATH=$HOME/.yarn/bin:$PATH
3140

3241
install:
33-
- npm install
42+
- yarn install --no-lockfile --non-interactive
3443

3544
script:
45+
- yarn lint:js
3646
# Usually, it's ok to finish the test scenario without reverting
3747
# to the addon's original dependency state, skipping "cleanup".
38-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
48+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

config/ember-try.js

Lines changed: 64 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,71 @@
1-
/* eslint-env node */
2-
module.exports = {
3-
scenarios: [
4-
{
5-
name: 'ember-lts-2.4',
6-
bower: {
7-
dependencies: {
8-
'ember': 'components/ember#lts-2-4'
1+
'use strict';
2+
3+
const getChannelURL = require('ember-source-channel-url');
4+
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+
npm: {
17+
devDependencies: {
18+
'ember-source': '~2.12.0'
19+
}
20+
}
921
},
10-
resolutions: {
11-
'ember': 'lts-2-4'
12-
}
13-
},
14-
npm: {
15-
devDependencies: {
16-
'ember-source': null
17-
}
18-
}
19-
},
20-
{
21-
name: 'ember-lts-2.8',
22-
bower: {
23-
dependencies: {
24-
'ember': 'components/ember#lts-2-8'
22+
{
23+
name: 'ember-lts-2.16',
24+
npm: {
25+
devDependencies: {
26+
'ember-source': '~2.16.0'
27+
}
28+
}
2529
},
26-
resolutions: {
27-
'ember': 'lts-2-8'
28-
}
29-
},
30-
npm: {
31-
devDependencies: {
32-
'ember-source': null
33-
}
34-
}
35-
},
36-
{
37-
name: 'ember-release',
38-
bower: {
39-
dependencies: {
40-
'ember': 'components/ember#release'
30+
{
31+
name: 'ember-lts-2.18',
32+
npm: {
33+
devDependencies: {
34+
'ember-source': '~2.18.0'
35+
}
36+
}
4137
},
42-
resolutions: {
43-
'ember': 'release'
44-
}
45-
},
46-
npm: {
47-
devDependencies: {
48-
'ember-source': null
49-
}
50-
}
51-
},
52-
{
53-
name: 'ember-beta',
54-
bower: {
55-
dependencies: {
56-
'ember': 'components/ember#beta'
38+
{
39+
name: 'ember-release',
40+
npm: {
41+
devDependencies: {
42+
'ember-source': urls[0]
43+
}
44+
}
5745
},
58-
resolutions: {
59-
'ember': 'beta'
60-
}
61-
},
62-
npm: {
63-
devDependencies: {
64-
'ember-source': null
65-
}
66-
}
67-
},
68-
{
69-
name: 'ember-canary',
70-
bower: {
71-
dependencies: {
72-
'ember': 'components/ember#canary'
46+
{
47+
name: 'ember-beta',
48+
npm: {
49+
devDependencies: {
50+
'ember-source': urls[1]
51+
}
52+
}
7353
},
74-
resolutions: {
75-
'ember': 'canary'
76-
}
77-
},
78-
npm: {
79-
devDependencies: {
80-
'ember-source': null
54+
{
55+
name: 'ember-canary',
56+
npm: {
57+
devDependencies: {
58+
'ember-source': urls[2]
59+
}
60+
}
61+
},
62+
{
63+
name: 'ember-default',
64+
npm: {
65+
devDependencies: {}
66+
}
8167
}
82-
}
83-
},
84-
{
85-
name: 'ember-default',
86-
npm: {
87-
devDependencies: {}
88-
}
89-
}
90-
]
68+
]
69+
};
70+
});
9171
};

config/environment.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
/* eslint-env node */
1+
'use strict';
2+
23
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
34

45
module.exports = function(defaults) {
5-
var app = new EmberAddon(defaults, {
6+
let app = new EmberAddon(defaults, {
67
// Add options here
78
});
89

0 commit comments

Comments
 (0)