Skip to content

Commit 6c89f2b

Browse files
chore(package.json): update to latest version of shelljs
1 parent 1ffb9ad commit 6c89f2b

File tree

4 files changed

+158
-10
lines changed

4 files changed

+158
-10
lines changed

lib/versions/version-info.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var getGitRepoInfo = function() {
5353
* @return {String} The codename if found, otherwise null/undefined
5454
*/
5555
var getCodeName = function(tagName) {
56-
var gitCatOutput = shell.exec('git cat-file -p ' + tagName, {silent:true}).output;
56+
var gitCatOutput = shell.exec('git cat-file -p ' + tagName, {silent:true}).stdout;
5757
var tagMessage = gitCatOutput.match(/^.*codename.*$/mg)[0];
5858
var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
5959
if (!codeName) {
@@ -69,7 +69,7 @@ var getCodeName = function(tagName) {
6969
* @return {String} The build segment of the version
7070
*/
7171
function getBuild() {
72-
var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).output.replace('\n', '');
72+
var hash = shell.exec('git rev-parse --short HEAD', {silent: true}).stdout.replace('\n', '');
7373
return 'sha.' + hash;
7474
}
7575

@@ -82,7 +82,7 @@ var getTaggedVersion = function() {
8282
var gitTagResult = shell.exec('git describe --exact-match', {silent:true});
8383

8484
if (gitTagResult.code === 0) {
85-
var tag = gitTagResult.output.trim();
85+
var tag = gitTagResult.stdout.trim();
8686
var version = semver.parse(tag);
8787

8888
if (version && semver.satisfies(version, currentPackage.branchVersion)) {
@@ -108,7 +108,7 @@ var getPreviousVersions = function() {
108108
var query = NO_REMOTE_REQUESTS ? 'git tag' : 'git ls-remote --tags ' + repo_url;
109109
var tagResults = shell.exec(query, {silent: true});
110110
if (tagResults.code === 0) {
111-
return _(tagResults.output.match(/v[0-9].*[0-9]$/mg))
111+
return _(tagResults.stdout.match(/v[0-9].*[0-9]$/mg))
112112
.map(function(tag) {
113113
var version = semver.parse(tag);
114114
return version;
@@ -154,7 +154,7 @@ var getCdnVersion = function() {
154154
{silent: true});
155155
if (cdnResult.code === 0) {
156156
// --write-out appends its content to the general request response, so extract it
157-
var statusCode = cdnResult.output.split('\n').pop().trim();
157+
var statusCode = cdnResult.stdout.split('\n').pop().trim();
158158
if (statusCode === '200') {
159159
cdnVersion = version;
160160
}

npm-shrinkwrap.clean.json

+60-1
Original file line numberDiff line numberDiff line change
@@ -8808,7 +8808,66 @@
88088808
}
88098809
},
88108810
"shelljs": {
8811-
"version": "0.3.0"
8811+
"version": "0.7.5",
8812+
"dependencies": {
8813+
"glob": {
8814+
"version": "7.1.1",
8815+
"dependencies": {
8816+
"fs.realpath": {
8817+
"version": "1.0.0"
8818+
},
8819+
"inflight": {
8820+
"version": "1.0.6",
8821+
"dependencies": {
8822+
"wrappy": {
8823+
"version": "1.0.2"
8824+
}
8825+
}
8826+
},
8827+
"inherits": {
8828+
"version": "2.0.3"
8829+
},
8830+
"minimatch": {
8831+
"version": "3.0.3",
8832+
"dependencies": {
8833+
"brace-expansion": {
8834+
"version": "1.1.6",
8835+
"dependencies": {
8836+
"balanced-match": {
8837+
"version": "0.4.2"
8838+
},
8839+
"concat-map": {
8840+
"version": "0.0.1"
8841+
}
8842+
}
8843+
}
8844+
}
8845+
},
8846+
"once": {
8847+
"version": "1.4.0",
8848+
"dependencies": {
8849+
"wrappy": {
8850+
"version": "1.0.2"
8851+
}
8852+
}
8853+
},
8854+
"path-is-absolute": {
8855+
"version": "1.0.1"
8856+
}
8857+
}
8858+
},
8859+
"interpret": {
8860+
"version": "1.0.1"
8861+
},
8862+
"rechoir": {
8863+
"version": "0.6.2",
8864+
"dependencies": {
8865+
"resolve": {
8866+
"version": "1.1.7"
8867+
}
8868+
}
8869+
}
8870+
}
88128871
},
88138872
"sorted-object": {
88148873
"version": "1.0.0"

npm-shrinkwrap.json

+92-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"serve-favicon": "^2.3.0",
8383
"serve-index": "^1.8.0",
8484
"serve-static": "^1.11.1",
85-
"shelljs": "~0.3.0",
85+
"shelljs": "^0.7.5",
8686
"sorted-object": "^1.0.0",
8787
"stringmap": "^0.2.2"
8888
},

0 commit comments

Comments
 (0)