Skip to content

Commit b8e1107

Browse files
committed
upgrade all the deps
1 parent aca5787 commit b8e1107

27 files changed

Lines changed: 630 additions & 694 deletions

.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: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module'
6+
},
7+
extends: 'eslint:recommended',
8+
env: {
9+
browser: true
10+
},
11+
rules: {
12+
}
13+
};

.gitignore

Lines changed: 2 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,5 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
16+
npm-debug.log*
1717
testem.log

.npmignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/bower_components
2+
/config/ember-try.js
3+
/dist
4+
/tests
5+
/tmp
6+
**/.gitkeep
7+
.bowerrc
8+
.editorconfig
9+
.ember-cli
10+
.gitignore
11+
.eslintrc.js
12+
.watchmanconfig
13+
.travis.yml
14+
bower.json
15+
ember-cli-build.js
16+
testem.js

.travis.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
---
2-
sudo: false
3-
42
language: node_js
53
node_js:
64
- "4"
75
- "6"
86
- "7"
97

8+
sudo: false
9+
10+
cache:
11+
yarn: true
12+
13+
matrix:
14+
fast_finish: true
15+
allow_failures:
16+
- env: EMBER_TRY_SCENARIO=ember-canary
17+
1018
before_install:
11-
# prevent the npm loading indicator
12-
- npm config --global set spin false
13-
# if npm version is less 3.0.0 (lets say 1.x or 2.x) we should attempt to upgrade to 3
14-
- if [[ $(npm -v | cut -d '.' -f 1) -lt 3 ]]; then npm i -g npm@^3; fi
19+
- curl -o- -L https://yarnpkg.com/install.sh | bash
20+
- export PATH=$HOME/.yarn/bin:$PATH
21+
- yarn global add phantomjs-prebuilt
22+
- phantomjs --version
1523

1624
install:
17-
- npm install -g bower
18-
- npm install
19-
- bower install
25+
- yarn install --no-lockfile
2026

2127
script:
22-
- npm test
28+
- yarn run test

.watchmanconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp"]
2+
"ignore_dirs": ["tmp", "dist"]
33
}

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ environment:
1010
matrix:
1111
- nodejs_version: "4"
1212
- nodejs_version: "6"
13+
- nodejs_version: "7"
1314

1415
cache:
1516
- '%APPDATA%\npm-cache'
@@ -26,8 +27,6 @@ install:
2627
- npm install phantomjs-prebuilt
2728
- npm install mocha-appveyor-reporter
2829
- npm install --no-optional
29-
- npm install -g bower
30-
- bower install
3130

3231
# Post-install test scripts.
3332
test_script:

bower.json

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

config/ember-try.js

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
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'
9+
},
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'
25+
},
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'
41+
},
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'
57+
},
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'
73+
},
74+
resolutions: {
75+
'ember': 'canary'
76+
}
77+
},
78+
npm: {
79+
devDependencies: {
80+
'ember-source': null
81+
}
82+
}
83+
},
84+
{
85+
name: 'ember-default',
86+
npm: {
87+
devDependencies: {}
88+
}
89+
}
90+
]
91+
};

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
'use strict';
33

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

0 commit comments

Comments
 (0)