Skip to content

Commit 5cea60d

Browse files
authored
Merge pull request #38 from ember-cli-deploy/dependency-update
Update dependencies and remove unnecessary files.
2 parents 7f1005c + ea3e0d4 commit 5cea60d

37 files changed

+26
-244
lines changed

.bowerrc

-4
This file was deleted.

addon/.gitkeep

Whitespace-only changes.

app/.gitkeep

Whitespace-only changes.

bower.json

-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
{
22
"name": "ember-cli-deploy-revision-data",
33
"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"
154
}
165
}

config/environment.js

-5
This file was deleted.
File renamed without changes.

lib/data-generators/file-hash.js

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ var readFile = denodeify(fs.readFile);
1010

1111
module.exports = CoreObject.extend({
1212
init: function(options) {
13+
this._super();
1314
this._plugin = options.plugin;
1415
},
1516

lib/data-generators/version-commit.js

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var readFile = denodeify(fs.readFile);
88

99
module.exports = CoreObject.extend({
1010
init: function(options) {
11+
this._super();
1112
this._plugin = options.plugin;
1213
},
1314

lib/scm-data-generators/git.js

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ var simpleGit = require('simple-git');
55

66
module.exports = CoreObject.extend({
77
init: function(path) {
8+
this._super();
89
this.path = path;
910
},
1011

package.json

+12-30
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,25 @@
1818
"author": "Aaron Chambers and the ember-cli-deploy team",
1919
"license": "MIT",
2020
"devDependencies": {
21-
"broccoli-asset-rev": "2.1.0",
22-
"chai": "^2.2.0",
23-
"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",
38-
"github": "^0.2.4",
39-
"glob": "^5.0.5",
40-
"mocha": "^2.2.4",
21+
"chai": "^3.5.0",
22+
"chai-as-promised": "^5.3.0",
23+
"ember-cli": "2.7.0",
24+
"github": "^2.5.1",
25+
"glob": "^7.0.5",
26+
"mocha": "^3.0.2",
4127
"multiline": "^1.0.2"
4228
},
4329
"keywords": [
4430
"ember-addon",
4531
"ember-cli-deploy-plugin"
4632
],
4733
"dependencies": {
48-
"chalk": "^1.0.0",
49-
"core-object": "^1.1.0",
50-
"ember-cli-babel": "^5.0.0",
51-
"ember-cli-deploy-plugin": "^0.2.1",
34+
"chalk": "^1.1.3",
35+
"core-object": "^2.0.6",
36+
"ember-cli-deploy-plugin": "^0.2.6",
5237
"git-repo-info": "^1.1.4",
53-
"minimatch": "^2.0.4",
54-
"rsvp": "^3.0.18",
55-
"simple-git": "^1.26.2"
56-
},
57-
"ember-addon": {
58-
"configPath": "tests/dummy/config"
38+
"minimatch": "^3.0.3",
39+
"rsvp": "^3.2.1",
40+
"simple-git": "^1.47.0"
5941
}
6042
}

tests/dummy/app/app.js

-18
This file was deleted.

tests/dummy/app/components/.gitkeep

Whitespace-only changes.

tests/dummy/app/controllers/.gitkeep

Whitespace-only changes.

tests/dummy/app/helpers/.gitkeep

Whitespace-only changes.

tests/dummy/app/index.html

-25
This file was deleted.

tests/dummy/app/models/.gitkeep

Whitespace-only changes.

tests/dummy/app/router.js

-9
This file was deleted.

tests/dummy/app/routes/.gitkeep

Whitespace-only changes.

tests/dummy/app/styles/app.css

Whitespace-only changes.

tests/dummy/app/templates/application.hbs

-3
This file was deleted.

tests/dummy/app/templates/components/.gitkeep

Whitespace-only changes.

tests/dummy/app/views/.gitkeep

Whitespace-only changes.

tests/dummy/config/environment.js

-47
This file was deleted.

tests/dummy/public/crossdomain.xml

-15
This file was deleted.

tests/dummy/public/robots.txt

-2
This file was deleted.

tests/helpers/assert.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
var chai = require('chai');
2+
var chaiAsPromised = require("chai-as-promised");
3+
chai.use(chaiAsPromised);
4+
5+
module.exports = chai.assert;

tests/helpers/resolver.js

-11
This file was deleted.

tests/helpers/start-app.js

-19
This file was deleted.

tests/index.html

-33
This file was deleted.

tests/test-helper.js

-6
This file was deleted.

tests/unit/index-nodetest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assert = require('ember-cli/tests/helpers/assert');
3+
var assert = require('../helpers/assert');
44

55
describe('the index', function() {
66
var subject, mockUi;

tests/unit/lib/data-generators/file-hash-nodetest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assert = require('ember-cli/tests/helpers/assert');
3+
var assert = require('../../../helpers/assert');
44

55
describe('the file-hash data generator', function() {
66
var DataGenerator;

tests/unit/lib/data-generators/git-commit-nodetest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assert = require('ember-cli/tests/helpers/assert');
3+
var assert = require('../../../helpers/assert');
44
var gitRepoInfo = require('git-repo-info');
55

66
describe('the git-commit data generator', function() {

tests/unit/lib/data-generators/git-tag-commit-nodetest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assert = require('ember-cli/tests/helpers/assert');
3+
var assert = require('../../../helpers/assert');
44
var gitRepoInfo = require('git-repo-info');
55

66
describe('the git-tag-commit data generator', function() {

tests/unit/lib/data-generators/version-commit-nodetest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assert = require('ember-cli/tests/helpers/assert');
3+
var assert = require('../../../helpers/assert');
44
var gitRepoInfo = require('git-repo-info');
55

66
describe('the version-commit data generator', function() {

tests/unit/lib/scm-data-generators/git-nodetest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var assert = require('ember-cli/tests/helpers/assert');
3+
var assert = require('../../../helpers/assert');
44
var gitRepoInfo = require('git-repo-info');
55
var ScmDataGenerator = require('../../../../lib/scm-data-generators/git');
66

vendor/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)