Skip to content

Commit c21f454

Browse files
committed
Update ember-cli to v2.11.1
Ran `ember init` and updated blueprints as well.
1 parent c504a83 commit c21f454

27 files changed

+271
-157
lines changed

.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

.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

.jshintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@
2727
"strict": false,
2828
"white": false,
2929
"eqnull": true,
30-
"esnext": true,
30+
"esversion": 6,
3131
"unused": true
3232
}

.npmignore

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

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
---
22
language: node_js
33
node_js:
4-
- "0.12"
4+
- "4"
55

66
sudo: false
77

88
cache:
99
directories:
10-
- node_modules
10+
- $HOME/.npm
11+
- $HOME/.cache # includes bowers cache
1112

1213
before_install:
13-
- "npm config set spin false"
14-
- "npm install -g npm@^2"
14+
- npm config set spin false
15+
- npm install -g bower
16+
- bower --version
1517

1618
install:
17-
- npm install -g bower
1819
- npm install
1920
- bower install
2021

.watchmanconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore_dirs": ["tmp", "dist"]
3+
}

Brocfile.js

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

bower.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
{
22
"name": "ember-cli-deploy-display-revisions",
3-
"dependencies": {
4-
"ember": "1.11.1",
5-
"ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
6-
"ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
7-
"ember-data": "1.0.0-beta.16.1",
8-
"ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
9-
"ember-qunit": "0.3.1",
10-
"ember-qunit-notifications": "0.0.7",
11-
"ember-resolver": "~0.1.15",
12-
"jquery": "^1.11.1",
13-
"loader.js": "ember-cli/loader.js#3.2.0",
14-
"qunit": "~1.17.1"
15-
}
16-
}
3+
"dependencies": {}
4+
}

config/ember-try.js

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*jshint node:true*/
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/*jshint node:true*/
12
'use strict';
23

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

0 commit comments

Comments
 (0)