Merge pull request #14458 from twbs/npm-deps

Update dev dependencies.

Merge pull request #14458 from twbs/npm-deps
Update dev dependencies.
4372d499 · XhmikosR · b1bb5736 · ac132da7 · 4372d499 · 4372d499
Commit 4372d499 authored 10 years ago by XhmikosR
Hide whitespace changes
Inline Side-by-side

Showing

with 83 additions and 107 deletions
+83 -107
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ after_script:
  - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
 env:
  global:
-    - JEKYLL_VERSION: 2.1.1
-    - ROUGE_VERSION: 1.6.1
+    - JEKYLL_VERSION: 2.3.0
+    - ROUGE_VERSION: 1.6.2
    - SAUCE_USERNAME: bootstrap
    - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ="
    - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY="

--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Bootstrap's documentation, included in this repo in the root directory, is built

 ### Running documentation locally

-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.1.x).
+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.3.x).
  - **Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`.
 3. From the root `/bootstrap` directory, run `jekyll serve` in the command line.

--- a/package.json
+++ b/package.json
@@ -31,9 +31,9 @@
  },
  "devDependencies": {
    "btoa": "~1.1.2",
-    "glob": "~4.0.4",
+    "glob": "~4.0.5",
    "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~1.0.0",
+    "grunt-autoprefixer": "~1.0.1",
    "grunt-banner": "~0.2.3",
    "grunt-contrib-clean": "~0.6.0",
    "grunt-contrib-concat": "~0.5.0",
@@ -43,21 +43,21 @@
    "grunt-contrib-cssmin": "~0.10.0",
    "grunt-contrib-jade": "~0.12.0",
    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-less": "~0.11.3",
+    "grunt-contrib-less": "~0.11.4",
    "grunt-contrib-qunit": "~0.5.2",
-    "grunt-contrib-uglify": "~0.5.0",
+    "grunt-contrib-uglify": "~0.5.1",
    "grunt-contrib-watch": "~0.6.1",
    "grunt-csscomb": "~3.0.0",
    "grunt-exec": "~0.4.6",
    "grunt-html-validation": "~0.1.18",
    "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~0.6.1",
-    "grunt-saucelabs": "~8.2.0",
+    "grunt-jscs": "~0.6.2",
+    "grunt-saucelabs": "~8.3.1",
    "grunt-sed": "~0.1.1",
    "load-grunt-tasks": "~0.6.0",
    "markdown": "~0.5.0",
-    "npm-shrinkwrap": "~3.1.6",
-    "time-grunt": "~0.4.0"
+    "npm-shrinkwrap": "~3.1.8",
+    "time-grunt": "~1.0.0"
  },
  "engines": {
    "node": "~0.10.1"

--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -226,52 +226,24 @@
      }
    },
    "grunt-autoprefixer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-1.0.0.tgz",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/grunt-autoprefixer/-/grunt-autoprefixer-1.0.1.tgz",
      "dependencies": {
-        "autoprefixer": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-2.2.0.tgz",
+        "autoprefixer-core": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/autoprefixer-core/-/autoprefixer-core-3.0.0.tgz",
          "dependencies": {
            "caniuse-db": {
-              "version": "1.0.20140804",
-              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140804.tgz"
-            },
-            "fs-extra": {
-              "version": "0.10.0",
-              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
-              "dependencies": {
-                "jsonfile": {
-                  "version": "1.2.0",
-                  "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz"
-                },
-                "mkdirp": {
-                  "version": "0.5.0",
-                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
-                  "dependencies": {
-                    "minimist": {
-                      "version": "0.0.8",
-                      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-                    }
-                  }
-                },
-                "ncp": {
-                  "version": "0.5.1",
-                  "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz"
-                },
-                "rimraf": {
-                  "version": "2.2.8",
-                  "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
-                }
-              }
+              "version": "1.0.20140821",
+              "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.20140821.tgz"
            },
            "postcss": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/postcss/-/postcss-2.1.0.tgz",
+              "version": "2.2.1",
+              "resolved": "https://registry.npmjs.org/postcss/-/postcss-2.2.1.tgz",
              "dependencies": {
-                "base64-js": {
-                  "version": "0.0.7",
-                  "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz"
+                "js-base64": {
+                  "version": "2.1.5",
+                  "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.5.tgz"
                },
                "source-map": {
                  "version": "0.1.38",
@@ -570,8 +542,8 @@
              "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-3.2.8.tgz",
              "dependencies": {
                "readable-stream": {
-                  "version": "1.1.13-1",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
+                  "version": "1.1.13",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                  "dependencies": {
                    "core-util-is": {
                      "version": "1.0.1",
@@ -586,8 +558,8 @@
                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                    },
                    "string_decoder": {
-                      "version": "0.10.25-1",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                      "version": "0.10.31",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                    }
                  }
                },
@@ -754,8 +726,8 @@
          }
        },
        "clean-css": {
-          "version": "2.2.12",
-          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.12.tgz",
+          "version": "2.2.14",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.14.tgz",
          "dependencies": {
            "commander": {
              "version": "2.2.0",
@@ -806,8 +778,8 @@
              }
            },
            "figures": {
-              "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/figures/-/figures-1.1.0.tgz"
+              "version": "1.3.2",
+              "resolved": "https://registry.npmjs.org/figures/-/figures-1.3.2.tgz"
            },
            "gzip-size": {
              "version": "0.2.0",
@@ -832,8 +804,8 @@
                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                    },
                    "readable-stream": {
-                      "version": "1.1.13-1",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
+                      "version": "1.1.13",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                      "dependencies": {
                        "core-util-is": {
                          "version": "1.0.1",
@@ -844,8 +816,8 @@
                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                        },
                        "string_decoder": {
-                          "version": "0.10.25-1",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                          "version": "0.10.31",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                        }
                      }
                    },
@@ -1036,8 +1008,8 @@
              }
            },
            "with": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/with/-/with-3.0.0.tgz",
+              "version": "3.0.1",
+              "resolved": "https://registry.npmjs.org/with/-/with-3.0.1.tgz",
              "dependencies": {
                "uglify-js": {
                  "version": "2.4.15",
@@ -1088,8 +1060,8 @@
          "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
        },
        "jshint": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.2.tgz",
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.5.tgz",
          "dependencies": {
            "cli": {
              "version": "0.6.3",
@@ -1156,8 +1128,8 @@
                  "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
                },
                "readable-stream": {
-                  "version": "1.1.13-1",
-                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
+                  "version": "1.1.13",
+                  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                  "dependencies": {
                    "core-util-is": {
                      "version": "1.0.1",
@@ -1172,8 +1144,8 @@
                      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                    },
                    "string_decoder": {
-                      "version": "0.10.25-1",
-                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                      "version": "0.10.31",
+                      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                    }
                  }
                }
@@ -1374,8 +1346,8 @@
                  "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
                  "dependencies": {
                    "punycode": {
-                      "version": "1.3.0",
-                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
+                      "version": "1.3.1",
+                      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
                    }
                  }
                },
@@ -1436,8 +1408,8 @@
                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                    },
                    "readable-stream": {
-                      "version": "1.1.13-1",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
+                      "version": "1.1.13",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                      "dependencies": {
                        "core-util-is": {
                          "version": "1.0.1",
@@ -1448,8 +1420,8 @@
                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                        },
                        "string_decoder": {
-                          "version": "0.10.25-1",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                          "version": "0.10.31",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                        }
                      }
                    },
@@ -1572,8 +1544,8 @@
                  }
                },
                "progress": {
-                  "version": "1.1.7",
-                  "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.7.tgz"
+                  "version": "1.1.8",
+                  "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"
                },
                "request": {
                  "version": "2.36.0",
@@ -1672,8 +1644,8 @@
                      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
                      "dependencies": {
                        "punycode": {
-                          "version": "1.3.0",
-                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
+                          "version": "1.3.1",
+                          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
                        }
                      }
                    },
@@ -1772,8 +1744,8 @@
          "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-0.2.2.tgz",
          "dependencies": {
            "figures": {
-              "version": "1.1.0",
-              "resolved": "https://registry.npmjs.org/figures/-/figures-1.1.0.tgz"
+              "version": "1.3.2",
+              "resolved": "https://registry.npmjs.org/figures/-/figures-1.3.2.tgz"
            },
            "gzip-size": {
              "version": "0.2.0",
@@ -1798,8 +1770,8 @@
                      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                    },
                    "readable-stream": {
-                      "version": "1.1.13-1",
-                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13-1.tgz",
+                      "version": "1.1.13",
+                      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                      "dependencies": {
                        "core-util-is": {
                          "version": "1.0.1",
@@ -1810,8 +1782,8 @@
                          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                        },
                        "string_decoder": {
-                          "version": "0.10.25-1",
-                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.25-1.tgz"
+                          "version": "0.10.31",
+                          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                        }
                      }
                    },
@@ -1962,8 +1934,8 @@
      "resolved": "https://registry.npmjs.org/grunt-csscomb/-/grunt-csscomb-3.0.0.tgz",
      "dependencies": {
        "csscomb": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/csscomb/-/csscomb-3.0.0.tgz",
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/csscomb/-/csscomb-3.0.1.tgz",
          "dependencies": {
            "commander": {
              "version": "2.0.0",
@@ -2162,8 +2134,8 @@
              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
              "dependencies": {
                "punycode": {
-                  "version": "1.3.0",
-                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
+                  "version": "1.3.1",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
                }
              }
            },
@@ -2718,8 +2690,8 @@
      }
    },
    "grunt-saucelabs": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/grunt-saucelabs/-/grunt-saucelabs-8.2.0.tgz",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/grunt-saucelabs/-/grunt-saucelabs-8.3.1.tgz",
      "dependencies": {
        "colors": {
          "version": "0.6.2",
@@ -3038,8 +3010,8 @@
              "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
              "dependencies": {
                "punycode": {
-                  "version": "1.3.0",
-                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.0.tgz"
+                  "version": "1.3.1",
+                  "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
                }
              }
            },
@@ -3366,8 +3338,8 @@
              "resolved": "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz",
              "dependencies": {
                "heap": {
-                  "version": "0.2.3",
-                  "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.3.tgz"
+                  "version": "0.2.4",
+                  "resolved": "https://registry.npmjs.org/heap/-/heap-0.2.4.tgz"
                }
              }
            },
@@ -3902,8 +3874,8 @@
      }
    },
    "time-grunt": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-0.4.0.tgz",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/time-grunt/-/time-grunt-1.0.0.tgz",
      "dependencies": {
        "chalk": {
          "version": "0.5.1",
@@ -3944,24 +3916,28 @@
          }
        },
        "date-time": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/date-time/-/date-time-0.1.1.tgz"
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/date-time/-/date-time-1.0.0.tgz"
        },
        "figures": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.1.0.tgz"
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-1.3.2.tgz"
        },
        "hooker": {
          "version": "0.2.3",
          "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
        },
        "pretty-ms": {
-          "version": "0.2.2",
-          "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-0.2.2.tgz",
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-1.0.0.tgz",
          "dependencies": {
+            "get-stdin": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.0.tgz"
+            },
            "parse-ms": {
-              "version": "0.1.2",
-              "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-0.1.2.tgz"
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.0.tgz"
            }
          }
        },