aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-12-28 18:58:36 -0800
committerChris Rebert <[email protected]>2014-12-28 18:58:36 -0800
commit120b1f164b6c0ac813d36bf5af0fc5eedb55d126 (patch)
tree8822cbaacf34d073230109576f774aed221bad9e
parent4484700d10fca0e3ccaa9fe6727f49575797f305 (diff)
parent109e4c7c163465c80ba3d2996322ebce7c9f77c2 (diff)
downloadbootstrap-120b1f164b6c0ac813d36bf5af0fc5eedb55d126.tar.xz
bootstrap-120b1f164b6c0ac813d36bf5af0fc5eedb55d126.zip
Merge pull request #15453 from twbs/bump-jade
bump grunt-contrib-jade to ~0.14.0
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json132
2 files changed, 29 insertions, 105 deletions
diff --git a/package.json b/package.json
index ec442abcc..de0ecfecc 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"grunt-contrib-copy": "~0.7.0",
"grunt-contrib-csslint": "~0.3.1",
"grunt-contrib-cssmin": "~0.10.0",
- "grunt-contrib-jade": "~0.13.0",
+ "grunt-contrib-jade": "~0.14.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.12.0",
"grunt-contrib-qunit": "~0.5.2",
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index 9427a6c24..fa4914abf 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -1308,8 +1308,8 @@
}
},
"grunt-contrib-jade": {
- "version": "0.13.0",
- "resolved": "https://registry.npmjs.org/grunt-contrib-jade/-/grunt-contrib-jade-0.13.0.tgz",
+ "version": "0.14.0",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-jade/-/grunt-contrib-jade-0.14.0.tgz",
"dependencies": {
"chalk": {
"version": "0.5.1",
@@ -1350,52 +1350,28 @@
}
},
"jade": {
- "version": "1.7.0",
- "resolved": "https://registry.npmjs.org/jade/-/jade-1.7.0.tgz",
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/jade/-/jade-1.8.2.tgz",
"dependencies": {
"character-parser": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz"
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"
},
"commander": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz"
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.5.1.tgz"
},
"constantinople": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-2.0.1.tgz",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz",
"dependencies": {
- "uglify-js": {
- "version": "2.4.16",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz",
+ "acorn-globals": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.1.tgz",
"dependencies": {
- "async": {
- "version": "0.2.10",
- "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
- },
- "optimist": {
- "version": "0.3.7",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
- "dependencies": {
- "wordwrap": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
- }
- }
- },
- "source-map": {
- "version": "0.1.34",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
- "dependencies": {
- "amdefine": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
- }
- }
- },
- "uglify-to-browserify": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+ "acorn": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz"
}
}
}
@@ -1411,38 +1387,6 @@
}
}
},
- "monocle": {
- "version": "1.1.51",
- "resolved": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz",
- "dependencies": {
- "readdirp": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz",
- "dependencies": {
- "minimatch": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz",
- "dependencies": {
- "brace-expansion": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz",
- "dependencies": {
- "balanced-match": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"
- },
- "concat-map": {
- "version": "0.0.1",
- "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
- }
- }
- }
- }
- }
- }
- }
- }
- },
"transformers": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz",
@@ -1504,40 +1448,20 @@
"resolved": "https://registry.npmjs.org/void-elements/-/void-elements-1.0.0.tgz"
},
"with": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/with/-/with-3.0.1.tgz",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/with/-/with-4.0.0.tgz",
"dependencies": {
- "uglify-js": {
- "version": "2.4.16",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz",
+ "acorn": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz"
+ },
+ "acorn-globals": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.1.tgz",
"dependencies": {
- "async": {
- "version": "0.2.10",
- "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
- },
- "optimist": {
- "version": "0.3.7",
- "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
- "dependencies": {
- "wordwrap": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
- }
- }
- },
- "source-map": {
- "version": "0.1.34",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
- "dependencies": {
- "amdefine": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"
- }
- }
- },
- "uglify-to-browserify": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+ "acorn": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-0.8.0.tgz"
}
}
}