aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-06-19 10:47:55 -0700
committerChris Rebert <[email protected]>2014-06-19 11:46:37 -0700
commit3c4ba2a08cef519f2135922f0549bf787cf3010d (patch)
tree53ae06b7fa848e82f2b9b34765112b645e0cb3a8 /package.json
parentd37b0ffa5f12a659e98a84f3f7d94c1fe1162405 (diff)
downloadbootstrap-3c4ba2a08cef519f2135922f0549bf787cf3010d.tar.xz
bootstrap-3c4ba2a08cef519f2135922f0549bf787cf3010d.zip
Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
Instead of our homegrown grunt/shrinkwrap.js Fixes #13483. New npm-shrinkwrap.json is human-readable but still in a consistent/stable format. Should aid debugging, produce better diffs, and be less prone to merge conflicts
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index dbb7f21e0..40feb944f 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,6 @@
},
"devDependencies": {
"btoa": "~1.1.2",
- "canonical-json": "~0.0.4",
"glob": "~4.0.2",
"grunt": "~0.4.5",
"grunt-autoprefixer": "~0.7.5",
@@ -57,6 +56,7 @@
"grunt-sed": "~0.1.1",
"load-grunt-tasks": "~0.5.0",
"markdown": "~0.5.0",
+ "npm-shrinkwrap": "~3.1.3",
"time-grunt": "~0.3.2"
},
"engines": {