aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2015-04-04 12:05:00 +0300
committerXhmikosR <[email protected]>2015-04-08 09:24:23 +0300
commit381a55ed1a5675ce1728de890759d61370315ab9 (patch)
treecdf5e5d928cd0ef18dc31996140ede89f403db38
parent8a9d698daf6e2e25004733810b9fa8d0a4a1ccd4 (diff)
downloadbootstrap-381a55ed1a5675ce1728de890759d61370315ab9.tar.xz
bootstrap-381a55ed1a5675ce1728de890759d61370315ab9.zip
Update dependencies.
-rw-r--r--Gruntfile.js6
-rw-r--r--package.json10
-rw-r--r--test-infra/npm-shrinkwrap.json176
3 files changed, 33 insertions, 159 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index b715189a9..7ae57b425 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -126,7 +126,11 @@ module.exports = function (grunt) {
uglify: {
options: {
- preserveComments: 'some'
+ compress: {
+ warnings: false
+ },
+ mangle: true,
+ preserveComments: 'some',
},
core: {
src: '<%= concat.bootstrap.dest %>',
diff --git a/package.json b/package.json
index 028088096..9494c1a25 100644
--- a/package.json
+++ b/package.json
@@ -45,9 +45,9 @@
"grunt-contrib-cssmin": "~0.12.2",
"grunt-contrib-jade": "~0.14.1",
"grunt-contrib-jshint": "~0.11.1",
- "grunt-contrib-less": "~1.0.0",
+ "grunt-contrib-less": "~1.0.1",
"grunt-contrib-qunit": "~0.7.0",
- "grunt-contrib-uglify": "~0.9.0",
+ "grunt-contrib-uglify": "~0.9.1",
"grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.0.0",
"grunt-exec": "~0.4.6",
@@ -82,6 +82,10 @@
"exports": "$"
}
},
- "files": ["css", "fonts", "js"]
+ "files": [
+ "css",
+ "fonts",
+ "js"
+ ]
}
}
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index f01793d5a..e8e0c3212 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -142,10 +142,6 @@
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz",
"dependencies": {
- "colors": {
- "version": "0.6.2",
- "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"
- },
"lodash": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz"
@@ -158,21 +154,7 @@
},
"grunt-legacy-util": {
"version": "0.2.0",
- "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz",
- "dependencies": {
- "async": {
- "version": "0.1.22",
- "resolved": "https://registry.npmjs.org/async/-/async-0.1.22.tgz"
- },
- "lodash": {
- "version": "0.9.2",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz"
- },
- "underscore.string": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz"
- }
- }
+ "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz"
},
"hooker": {
"version": "0.2.3",
@@ -261,8 +243,8 @@
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-0.2.0.tgz"
},
"caniuse-db": {
- "version": "1.0.30000117",
- "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000117.tgz"
+ "version": "1.0.30000119",
+ "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000119.tgz"
},
"num2fraction": {
"version": "1.0.1",
@@ -449,8 +431,8 @@
}
},
"tar-stream": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.2.tgz",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.3.tgz",
"dependencies": {
"bl": {
"version": "0.9.4",
@@ -757,8 +739,8 @@
}
},
"depd": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.0.tgz"
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"
},
"errorhandler": {
"version": "1.3.5",
@@ -1485,8 +1467,8 @@
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz",
"dependencies": {
"acorn": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.1.tgz"
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz"
}
}
}
@@ -1567,8 +1549,8 @@
"resolved": "https://registry.npmjs.org/with/-/with-4.0.3.tgz",
"dependencies": {
"acorn": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.1.tgz"
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz"
},
"acorn-globals": {
"version": "1.0.4",
@@ -1727,8 +1709,8 @@
}
},
"grunt-contrib-less": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.1.tgz",
"dependencies": {
"async": {
"version": "0.9.0",
@@ -1773,8 +1755,8 @@
}
},
"less": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/less/-/less-2.5.0.tgz",
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/less/-/less-2.4.0.tgz",
"dependencies": {
"errno": {
"version": "0.1.2",
@@ -1869,8 +1851,8 @@
}
},
"forever-agent": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.0.tgz"
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
},
"form-data": {
"version": "0.2.0",
@@ -2057,8 +2039,8 @@
}
},
"source-map": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
"dependencies": {
"amdefine": {
"version": "0.1.0",
@@ -2421,8 +2403,8 @@
}
},
"grunt-contrib-uglify": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.0.tgz",
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.1.tgz",
"dependencies": {
"chalk": {
"version": "1.0.0",
@@ -2474,48 +2456,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz",
"dependencies": {
- "chalk": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz",
- "dependencies": {
- "ansi-styles": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"
- },
- "escape-string-regexp": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
- },
- "has-ansi": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
- "dependencies": {
- "ansi-regex": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
- },
- "get-stdin": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
- }
- }
- },
- "strip-ansi": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
- "dependencies": {
- "ansi-regex": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
- }
- }
- },
- "supports-color": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.0.tgz"
- }
- }
- },
"figures": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/figures/-/figures-1.3.5.tgz"
@@ -2986,36 +2926,6 @@
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
},
- "glob": {
- "version": "4.3.5",
- "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
- "dependencies": {
- "inflight": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
- "dependencies": {
- "wrappy": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
- }
- }
- },
- "inherits": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
- },
- "once": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
- "dependencies": {
- "wrappy": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
- }
- }
- }
- }
- },
"lodash.assign": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.0.0.tgz",
@@ -3158,26 +3068,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
- "minimatch": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.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"
- }
- }
- }
- }
- },
"once": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",
@@ -3230,10 +3120,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"
},
- "supports-color": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"
- },
"vow-fs": {
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
@@ -3256,26 +3142,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
},
- "minimatch": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.4.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"
- }
- }
- }
- }
- },
"once": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/once/-/once-1.3.1.tgz",