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

Commit 0df1c4b

Browse files
AlonskiAlonski
committed
Updated to Ember-CLI v2.4.3
1 parent 1209e52 commit 0df1c4b

File tree

15 files changed

+1771
-903
lines changed

15 files changed

+1771
-903
lines changed

‎.npmignore

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
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+
.gitignore
11+
.jshintrc
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

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ cache:
1111

1212
env:
1313
- EMBER_TRY_SCENARIO=default
14+
- EMBER_TRY_SCENARIO=ember-1.13
1415
- EMBER_TRY_SCENARIO=ember-release
1516
- EMBER_TRY_SCENARIO=ember-beta
1617
- EMBER_TRY_SCENARIO=ember-canary

‎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: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
{
22
"name": "ember-cli-deploy-ghpages",
33
"dependencies": {
4-
"ember": "1.13.11",
5-
"ember-cli-shims": "0.0.6",
6-
"ember-cli-test-loader": "0.2.1",
7-
"ember-data": "1.13.15",
8-
"ember-load-initializers": "0.1.7",
9-
"ember-qunit": "0.4.16",
10-
"ember-qunit-notifications": "0.1.0",
11-
"ember-resolver": "~0.1.20",
12-
"jquery": "^1.11.3",
13-
"loader.js": "ember-cli/loader.js#3.4.0",
14-
"qunit": "~1.20.0"
4+
"ember": "~2.4.3",
5+
"ember-cli-shims": "0.1.1",
6+
"ember-cli-test-loader": "0.2.2",
7+
"ember-qunit-notifications": "0.1.0"
158
}
16-
}
9+
}

‎config/ember-try.js

Lines changed: 35 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,52 @@ module.exports = {
33
scenarios: [
44
{
55
name: 'default',
6-
dependencies: { }
6+
bower: {
7+
dependencies: { }
8+
}
9+
},
10+
{
11+
name: 'ember-1.13',
12+
bower: {
13+
dependencies: {
14+
'ember': '~1.13.0'
15+
},
16+
resolutions: {
17+
'ember': '~1.13.0'
18+
}
19+
}
720
},
821
{
922
name: 'ember-release',
10-
dependencies: {
11-
'ember': 'components/ember#release'
12-
},
13-
resolutions: {
14-
'ember': 'release'
23+
bower: {
24+
dependencies: {
25+
'ember': 'components/ember#release'
26+
},
27+
resolutions: {
28+
'ember': 'release'
29+
}
1530
}
1631
},
1732
{
1833
name: 'ember-beta',
19-
dependencies: {
20-
'ember': 'components/ember#beta'
21-
},
22-
resolutions: {
23-
'ember': 'beta'
34+
bower: {
35+
dependencies: {
36+
'ember': 'components/ember#beta'
37+
},
38+
resolutions: {
39+
'ember': 'beta'
40+
}
2441
}
2542
},
2643
{
2744
name: 'ember-canary',
28-
dependencies: {
29-
'ember': 'components/ember#canary'
30-
},
31-
resolutions: {
32-
'ember': 'canary'
45+
bower: {
46+
dependencies: {
47+
'ember': 'components/ember#canary'
48+
},
49+
resolutions: {
50+
'ember': 'canary'
51+
}
3352
}
3453
}
3554
]

‎ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function(defaults) {
88
});
99

1010
/*
11-
This build file specifes the options for the dummy test app of this
11+
This build file specifies the options for the dummy test app of this
1212
addon, located in `/tests/dummy`
1313
This build file does *not* influence how the addon or the app using it
1414
behave. You most likely want to be modifying `./index.js` or app's build file

‎package.json

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
1-
{
2-
"name": "ember-cli-deploy-ghpages",
3-
"version": "0.2.0",
4-
"description": "An ember-cli-deploy plugin to upload to GitHub Pages.",
5-
"directories": {
6-
"doc": "doc",
7-
"test": "tests"
8-
},
9-
"scripts": {
10-
"build": "ember build",
11-
"start": "ember server",
12-
"test": "node tests/runner.js"
13-
},
14-
"repository": "https://github.com/VerdigrisTech/ember-cli-deploy-ghpages",
15-
"engines": {
16-
"node": ">= 4.0.0"
17-
},
18-
"author": "Andrew Jo <andrew@verdigris.co> (https://github.com/AndrewJo)",
19-
"license": "BSD-2-Clause",
20-
"devDependencies": {
21-
"broccoli-asset-rev": "^2.2.0",
22-
"chai": "^3.5.0",
23-
"codecov": ">1.0.0",
24-
"ember-cli": "1.13.13",
25-
"ember-cli-app-version": "^1.0.0",
26-
"ember-cli-content-security-policy": "0.4.0",
27-
"ember-cli-dependency-checker": "^1.1.0",
28-
"ember-cli-htmlbars": "^1.0.1",
29-
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
30-
"ember-cli-ic-ajax": "0.2.4",
31-
"ember-cli-inject-live-reload": "^1.3.1",
32-
"ember-cli-qunit": "^1.0.4",
33-
"ember-cli-release": "0.2.8",
34-
"ember-cli-sri": "^1.2.0",
35-
"ember-cli-uglify": "^1.2.0",
36-
"ember-data": "1.13.15",
37-
"ember-disable-prototype-extensions": "^1.0.0",
38-
"ember-disable-proxy-controllers": "^1.0.1",
39-
"ember-export-application-global": "^1.0.4",
40-
"ember-try": "~0.0.8",
41-
"glob": "^7.0.3",
42-
"mocha": "^2.4.5"
43-
},
44-
"keywords": [
45-
"ember-addon",
46-
"ember-cli-deploy-plugin"
47-
],
48-
"dependencies": {
49-
"denodeify": "^1.2.1",
50-
"ember-cli-babel": "^5.1.5",
51-
"ember-cli-deploy-plugin": "^0.2.5",
52-
"fs-extra": "^0.28.0",
53-
"gift": "^0.7.0",
54-
"rsvp": "^3.2.1"
55-
},
56-
"ember-addon": {
57-
"configPath": "tests/dummy/config"
58-
}
59-
}
1+
{
2+
"name": "ember-cli-deploy-ghpages",
3+
"version": "0.2.0",
4+
"description": "An ember-cli-deploy plugin to upload to GitHub Pages.",
5+
"directories": {
6+
"doc": "doc",
7+
"test": "tests"
8+
},
9+
"scripts": {
10+
"build": "ember build",
11+
"start": "ember server",
12+
"test": "node tests/runner.js"
13+
},
14+
"repository": "https://github.com/VerdigrisTech/ember-cli-deploy-ghpages",
15+
"engines": {
16+
"node": ">= 4.0.0"
17+
},
18+
"author": "Andrew Jo <andrew@verdigris.co> (https://github.com/AndrewJo)",
19+
"license": "BSD-2-Clause",
20+
"devDependencies": {
21+
"broccoli-asset-rev": "^2.4.2",
22+
"chai": "^3.5.0",
23+
"codecov": ">1.0.0",
24+
"ember-ajax": "0.7.1",
25+
"ember-cli": "2.4.3",
26+
"ember-cli-app-version": "^1.0.0",
27+
"ember-cli-dependency-checker": "^1.2.0",
28+
"ember-cli-htmlbars": "^1.0.3",
29+
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
30+
"ember-cli-inject-live-reload": "^1.4.0",
31+
"ember-cli-qunit": "^1.4.0",
32+
"ember-cli-release": "0.2.8",
33+
"ember-cli-sri": "^2.1.0",
34+
"ember-cli-uglify": "^1.2.0",
35+
"ember-data": "^2.4.2",
36+
"ember-disable-prototype-extensions": "^1.1.0",
37+
"ember-export-application-global": "^1.0.5",
38+
"ember-load-initializers": "^0.5.1",
39+
"ember-resolver": "^2.0.3",
40+
"ember-try": "^0.2.2",
41+
"glob": "^7.0.3",
42+
"loader.js": "^4.0.1",
43+
"mocha": "^2.4.5"
44+
},
45+
"keywords": [
46+
"ember-addon",
47+
"ember-cli-deploy-plugin"
48+
],
49+
"dependencies": {
50+
"denodeify": "^1.2.1",
51+
"ember-cli-babel": "^5.1.6",
52+
"ember-cli-deploy-plugin": "^0.2.5",
53+
"fs-extra": "^0.28.0",
54+
"gift": "^0.7.0",
55+
"rsvp": "^3.2.1"
56+
},
57+
"ember-addon": {
58+
"configPath": "tests/dummy/config"
59+
}
60+
}

‎testem.json renamed to ‎testem.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{
1+
/*jshint node:true*/
2+
module.exports = {
23
"framework": "qunit",
34
"test_page": "tests/index.html?hidepassed",
45
"disable_watching": true,
@@ -9,4 +10,4 @@
910
"PhantomJS",
1011
"Chrome"
1112
]
12-
}
13+
};

‎tests/dummy/app/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Ember from 'ember';
2-
import Resolver from 'ember/resolver';
3-
import loadInitializers from 'ember/load-initializers';
2+
import Resolver from './resolver';
3+
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

66
let App;

‎tests/dummy/app/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
<meta name="description" content="">
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

10-
{{content-for 'head'}}
10+
{{content-for "head"}}
1111

1212
<link rel="stylesheet" href="assets/vendor.css">
1313
<link rel="stylesheet" href="assets/dummy.css">
1414

15-
{{content-for 'head-footer'}}
15+
{{content-for "head-footer"}}
1616
</head>
1717
<body>
18-
{{content-for 'body'}}
18+
{{content-for "body"}}
1919

2020
<script src="assets/vendor.js"></script>
2121
<script src="assets/dummy.js"></script>
2222

23-
{{content-for 'body-footer'}}
23+
{{content-for "body-footer"}}
2424
</body>
2525
</html>

0 commit comments

Comments
 (0)