Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit 9b43400

Browse files
authored
Merge pull request #8 from Alonski/update-dependencies
Update dependencies to v2.18.2
2 parents ef47a77 + 77e763f commit 9b43400

33 files changed

+19033
-306
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.editorconfig

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ insert_final_newline = true
1313
indent_style = space
1414
indent_size = 2
1515

16-
[*.js]
17-
indent_style = space
18-
indent_size = 2
19-
2016
[*.hbs]
2117
insert_final_newline = false
22-
indent_style = space
23-
indent_size = 2
24-
25-
[*.css]
26-
indent_style = space
27-
indent_size = 2
28-
29-
[*.html]
30-
indent_style = space
31-
indent_size = 2
3218

3319
[*.{diff,md}]
3420
trim_trailing_whitespace = false

.eslintrc.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module'
6+
},
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
14+
env: {
15+
browser: true
16+
},
17+
rules: {
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+
48+
// test files
49+
{
50+
files: ['tests/**/*.js'],
51+
excludedFiles: ['tests/dummy/**/*.js'],
52+
env: {
53+
embertest: true
54+
}
55+
}
56+
]
57+
};

.gitignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,5 +13,11 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
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

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.npmignore

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1-
bower_components/
2-
tests/
3-
tmp/
4-
dist/
5-
1+
/bower_components
2+
/config/ember-try.js
3+
/dist
4+
/tests
5+
/tmp
6+
**/.gitkeep
67
.bowerrc
78
.editorconfig
89
.ember-cli
10+
.eslintrc.js
11+
.gitignore
12+
.watchmanconfig
913
.travis.yml
10-
.npmignore
11-
**/.gitkeep
1214
bower.json
13-
Brocfile.js
14-
testem.json
15+
ember-cli-build.js
16+
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: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,43 @@
11
---
22
language: node_js
33
node_js:
4-
- "4.0"
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+
- "8.10"
57

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

814
cache:
915
directories:
10-
- node_modules
16+
- $HOME/.npm
1117

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

1832
matrix:
1933
fast_finish: true
2034
allow_failures:
2135
- env: EMBER_TRY_SCENARIO=ember-canary
2236

2337
before_install:
24-
- export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
25-
- "npm config set spin false"
26-
- "npm install -g npm@^2"
27-
28-
install:
29-
- npm install -g bower
30-
- npm install
31-
- bower install
38+
- npm config set spin false
39+
- npm install -g npm@8.10
40+
- npm --version
3241

3342
script:
3443
- npm test

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323

2424
The views and conclusions contained in the software and documentation are those
2525
of the authors and should not be interpreted as representing official policies,
26-
either expressed or implied, of the FreeBSD Project.
26+
either expressed or implied, of the FreeBSD Project.

bower.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

config/ember-try.js

Lines changed: 53 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,73 @@
1-
/*jshint node:true*/
21
module.exports = {
32
scenarios: [
43
{
5-
name: 'default',
6-
dependencies: { }
4+
name: 'ember-lts-2.12',
5+
npm: {
6+
devDependencies: {
7+
'ember-source': '~2.12.0'
8+
}
9+
}
710
},
811
{
12+
name: 'ember-lts-2.16',
13+
npm: {
14+
devDependencies: {
15+
'ember-source': '~2.16.0'
16+
}
17+
}
18+
},
19+
{
920
name: 'ember-release',
10-
dependencies: {
11-
'ember': 'components/ember#release'
21+
bower: {
22+
dependencies: {
23+
'ember': 'components/ember#release'
24+
},
25+
resolutions: {
26+
'ember': 'release'
27+
}
1228
},
13-
resolutions: {
14-
'ember': 'release'
29+
npm: {
30+
devDependencies: {
31+
'ember-source': null
32+
}
1533
}
1634
},
1735
{
1836
name: 'ember-beta',
19-
dependencies: {
20-
'ember': 'components/ember#beta'
37+
bower: {
38+
dependencies: {
39+
'ember': 'components/ember#beta'
40+
},
41+
resolutions: {
42+
'ember': 'beta'
43+
}
2144
},
22-
resolutions: {
23-
'ember': 'beta'
45+
npm: {
46+
devDependencies: {
47+
'ember-source': null
48+
}
2449
}
2550
},
2651
{
2752
name: 'ember-canary',
28-
dependencies: {
29-
'ember': 'components/ember#canary'
53+
bower: {
54+
dependencies: {
55+
'ember': 'components/ember#canary'
56+
},
57+
resolutions: {
58+
'ember': 'canary'
59+
}
3060
},
31-
resolutions: {
32-
'ember': 'canary'
61+
npm: {
62+
devDependencies: {
63+
'ember-source': null
64+
}
65+
}
66+
},
67+
{
68+
name: 'ember-default',
69+
npm: {
70+
devDependencies: {}
3371
}
3472
}
3573
]

0 commit comments

Comments
 (0)