Skip to content

Commit c21f454

Browse files
jrjohnsonjrjohnson
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

-14
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

+2-2
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

+1-1
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

+11-8
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

+6-5
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

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

‎Brocfile.js

-21
This file was deleted.

‎bower.json

+2-14
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

+91
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

+1
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 */) {

‎ember-cli-build.js

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*jshint node:true*/
2+
/* global require, module */
3+
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4+
5+
module.exports = function(defaults) {
6+
var app = new EmberAddon(defaults, {
7+
// Add options here
8+
});
9+
10+
/*
11+
This build file specifies the options for the dummy test app of this
12+
addon, located in `/tests/dummy`
13+
This build file does *not* influence how the addon or the app using it
14+
behave. You most likely want to be modifying `./index.js` or app's build file
15+
*/
16+
17+
return app.toTree();
18+
};

‎package.json

+38-31
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,59 @@
22
"name": "ember-cli-deploy-display-revisions",
33
"version": "0.2.2",
44
"description": "Display a list of deployed revisions using ember-cli-deploy.",
5+
"keywords": [
6+
"ember-addon",
7+
"ember-cli-deploy-plugin"
8+
],
9+
"license": "MIT",
10+
"author": "",
511
"directories": {
612
"doc": "doc",
713
"test": "tests"
814
},
15+
"repository": "https://github.com/duizendnegen/ember-cli-deploy-display-revisions",
916
"scripts": {
10-
"start": "ember server",
1117
"build": "ember build",
18+
"start": "ember server",
1219
"test": "node tests/runner.js"
1320
},
14-
"repository": "https://github.com/duizendnegen/ember-cli-deploy-display-revisions",
15-
"engines": {
16-
"node": ">= 0.10.0"
21+
"dependencies": {
22+
"cli-table2": "^0.2.0",
23+
"core-object": "^2.0.0",
24+
"ember-cli-babel": "^5.1.7",
25+
"ember-cli-deploy-plugin": "^0.2.3",
26+
"moment": "2.10.6"
1727
},
18-
"author": "",
19-
"license": "MIT",
2028
"devDependencies": {
21-
"broccoli-asset-rev": "^2.0.2",
29+
"broccoli-asset-rev": "^2.4.5",
2230
"chai": "^2.2.0",
2331
"chai-as-promised": "^5.0.0",
24-
"ember-cli": "0.2.3",
25-
"ember-cli-app-version": "0.3.3",
26-
"ember-cli-content-security-policy": "0.4.0",
27-
"ember-cli-dependency-checker": "0.0.8",
28-
"ember-cli-htmlbars": "0.7.4",
29-
"ember-cli-ic-ajax": "0.1.1",
30-
"ember-cli-inject-live-reload": "^1.3.0",
31-
"ember-cli-qunit": "0.3.10",
32-
"ember-cli-release": "1.0.0-beta.1",
33-
"ember-cli-uglify": "1.0.1",
34-
"ember-data": "1.0.0-beta.16.1",
35-
"ember-disable-prototype-extensions": "^1.0.0",
36-
"ember-export-application-global": "^1.0.2",
37-
"ember-try": "0.0.4",
32+
"ember-ajax": "^2.4.1",
33+
"ember-cli": "2.11.1",
34+
"ember-cli-app-version": "^2.0.0",
35+
"ember-cli-dependency-checker": "^1.3.0",
36+
"ember-cli-htmlbars": "^1.1.1",
37+
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
38+
"ember-cli-inject-live-reload": "^1.4.1",
39+
"ember-cli-jshint": "^2.0.1",
40+
"ember-cli-qunit": "^3.0.1",
41+
"ember-cli-release": "^0.2.9",
42+
"ember-cli-shims": "^1.0.2",
43+
"ember-cli-sri": "^2.1.0",
44+
"ember-cli-test-loader": "^1.1.0",
45+
"ember-cli-uglify": "^1.2.0",
46+
"ember-data": "^2.11.0",
47+
"ember-disable-prototype-extensions": "^1.1.0",
48+
"ember-export-application-global": "^1.0.5",
49+
"ember-load-initializers": "^0.6.0",
50+
"ember-resolver": "^2.0.3",
51+
"ember-source": "~2.11.0",
52+
"loader.js": "^4.0.10",
3853
"glob": "^5.0.5",
3954
"mocha": "^2.2.4"
4055
},
41-
"keywords": [
42-
"ember-addon",
43-
"ember-cli-deploy-plugin"
44-
],
45-
"dependencies": {
46-
"cli-table2": "^0.2.0",
47-
"core-object": "^2.0.0",
48-
"ember-cli-babel": "^5.0.0",
49-
"ember-cli-deploy-plugin": "^0.2.3",
50-
"moment": "2.10.6"
56+
"engines": {
57+
"node": ">= 0.12.0"
5158
},
5259
"ember-addon": {
5360
"configPath": "tests/dummy/config"

‎testem.json renamed to ‎testem.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
{
1+
/*jshint node:true*/
2+
module.exports = {
23
"framework": "qunit",
34
"test_page": "tests/index.html?hidepassed",
5+
"disable_watching": true,
46
"launch_in_ci": [
57
"PhantomJS"
68
],
79
"launch_in_dev": [
810
"PhantomJS",
911
"Chrome"
1012
]
11-
}
13+
};

‎tests/.jshintrc

+4-9
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,12 @@
2121
"andThen",
2222
"currentURL",
2323
"currentPath",
24-
"currentRouteName",
25-
"require",
26-
"describe",
27-
"before",
28-
"beforeEach",
29-
"it",
30-
"process"
24+
"currentRouteName"
3125
],
3226
"node": false,
3327
"browser": false,
3428
"boss": true,
35-
"curly": false,
29+
"curly": true,
3630
"debug": false,
3731
"devel": false,
3832
"eqeqeq": true,
@@ -53,5 +47,6 @@
5347
"strict": false,
5448
"white": false,
5549
"eqnull": true,
56-
"esnext": true
50+
"esversion": 6,
51+
"unused": true
5752
}

0 commit comments

Comments
 (0)