Skip to content

Commit 9c85228

Browse files
authored
Merge pull request #92 from ember-cli-deploy/chore/update-minimatch
Update dependencies
2 parents 93b34c1 + f5bb22e commit 9c85228

File tree

4 files changed

+2054
-1732
lines changed

4 files changed

+2054
-1732
lines changed

bin/changelog

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313

1414
var EOL = require('os').EOL;
15-
var multiline = require('multiline');
1615
var RSVP = require('rsvp');
1716
var GitHubApi = require('github');
1817

@@ -67,7 +66,7 @@ compareCommits({
6766
})
6867

6968
function generateChangelog(contributions) {
70-
var header = multiline(function() {/*
69+
var header = `
7170
The following changes are required if you are upgrading from the previous
7271
version:
7372
- Users
@@ -77,7 +76,7 @@ version:
7776
- Core Contributors
7877
+ No changes required
7978
#### Community Contributions
80-
*/});
79+
`;
8180

8281
var footer = 'Thank you to all who took the time to contribute!';
8382

package.json

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"test": "tests"
88
},
99
"scripts": {
10+
"release": "release-it",
1011
"test": "node tests/runner.js && ./node_modules/.bin/eslint index.js lib/* tests/**/*.js"
1112
},
1213
"repository": "https://github.com/ember-cli-deploy/ember-cli-deploy-s3-index",
@@ -16,26 +17,33 @@
1617
"author": "",
1718
"license": "MIT",
1819
"devDependencies": {
19-
"broccoli-asset-rev": "^2.4.2",
20-
"chai": "^3.5.0",
21-
"chai-as-promised": "^6.0.0",
22-
"ember-cli": "~3.17.0",
23-
"ember-cli-release": "1.0.0-beta.2",
24-
"eslint": "^4.18.2",
2520
"github": "^0.2.4",
26-
"glob": "^7.1.1",
27-
"mocha": "^3.2.0",
28-
"multiline": "^1.0.2"
21+
"chai": "^4.2.0",
22+
"chai-as-promised": "^7.1.1",
23+
"ember-cli": "~3.18.0",
24+
"eslint": "^7.0.0",
25+
"glob": "^7.1.6",
26+
"mocha": "^7.1.2",
27+
"release-it": "*"
2928
},
3029
"keywords": [
3130
"ember-addon",
3231
"ember-cli-deploy-plugin"
3332
],
3433
"dependencies": {
35-
"aws-sdk": "^2.1.48",
36-
"core-object": "^2.0.6",
34+
"aws-sdk": "^2.667.0",
35+
"core-object": "^3.0.0",
3736
"ember-cli-deploy-plugin": "^0.2.9",
38-
"mime-types": "^2.1.9",
39-
"rsvp": "^3.0.18"
37+
"mime-types": "^2.1.27",
38+
"rsvp": "^4.8.5"
39+
},
40+
"release-it": {
41+
"git": {
42+
"changelog": "./bin/changelog",
43+
"requireCleanWorkingDir": false
44+
},
45+
"github": {
46+
"release": true
47+
}
4048
}
4149
}

tests/unit/index-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ describe('s3-index plugin', function() {
140140

141141
return assert.isFulfilled(promise)
142142
.then(function() {
143-
assert.equal(s3Options.hasOwnProperty('serverSideEncryption'), false, 'serverSideEncryption filtered correctly');
143+
assert.equal(Object.prototype.hasOwnProperty.call(s3Options, 'serverSideEncryption'), false, 'serverSideEncryption filtered correctly');
144144
});
145145
});
146146

@@ -227,7 +227,7 @@ describe('s3-index plugin', function() {
227227

228228
return assert.isFulfilled(promise)
229229
.then(function() {
230-
assert.equal(s3Options.hasOwnProperty('serverSideEncryption'), false, 'serverSideEncryption filtered correctly');
230+
assert.equal(Object.prototype.hasOwnProperty.call(s3Options, 'serverSideEncryption'), false, 'serverSideEncryption filtered correctly');
231231
});
232232
});
233233
});

0 commit comments

Comments
 (0)