Merge pull request #20201 from twbs/v4-dev-xmr-deps

Update dependencies.

Gemfile

@@ -4,5 +4,5 @@ group :development, :test do
   gem 'jekyll', '~> 3.1.2'
   gem 'jekyll-redirect-from', '~> 0.10.0'
   gem 'jekyll-sitemap', '~> 0.10.0'
-  gem 'scss_lint', '~> 0.47.1'
+  gem 'scss_lint', '~> 0.48.0'
 end

Gemfile.lock

@@ -26,15 +26,15 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
-    rake (10.5.0)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rouge (1.10.1)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
-    scss_lint (0.47.1)
-      rake (>= 0.9, < 11)
+    scss_lint (0.48.0)
+      rake (>= 0.9, < 12)
       sass (~> 3.4.15)
 
 PLATFORMS
@@ -45,7 +45,7 @@ DEPENDENCIES
   jekyll (~> 3.1.2)
   jekyll-redirect-from (~> 0.10.0)
   jekyll-sitemap (~> 0.10.0)
-  scss_lint (~> 0.47.1)
+  scss_lint (~> 0.48.0)
 
 BUNDLED WITH
    1.12.5

Gruntfile.js

@@ -226,14 +226,14 @@ module.exports = function (grunt) {
     htmllint: {
       options: {
         ignore: [
-          'Element “img” is missing required attribute “src”.',
-          'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime”, “datetime-local”, “email”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
+          'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime”, “datetime-local”, “email”, “hidden”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.',
           'Attribute “autocomplete” not allowed on element “button” at this point.',
-          'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
           'Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).',
-          'The “datetime” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
+          'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)',
+          'Element “img” is missing required attribute “src”.',
           'The “color” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
           'The “date” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
+          'The “datetime” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
           'The “datetime-local” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
           'The “month” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
           'The “time” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',

dist/js/bootstrap.js

@@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') {
 
 +function ($) {
   var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) {
-    throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0')
+  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {
+    throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
   }
 }(jQuery);
 

docs/dist/js/bootstrap.js

@@ -10,8 +10,8 @@ if (typeof jQuery === 'undefined') {
 
 +function ($) {
   var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 3)) {
-    throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v3.0.0')
+  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {
+    throw new Error('Bootstrap\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
   }
 }(jQuery);
 

grunt/npm-shrinkwrap.json

@@ -1276,7 +1276,7 @@
     },
     "glob": {
       "version": "7.0.5",
-      "from": "glob@>=7.0.0 <8.0.0",
+      "from": "glob@>=7.0.3 <8.0.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
     },
     "glob-base": {
@@ -1386,9 +1386,9 @@
       "resolved": "https://registry.npmjs.org/grunt-babel/-/grunt-babel-5.0.3.tgz"
     },
     "grunt-build-control": {
-      "version": "0.6.3",
-      "from": "grunt-build-control@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/grunt-build-control/-/grunt-build-control-0.6.3.tgz",
+      "version": "0.7.0",
+      "from": "grunt-build-control@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/grunt-build-control/-/grunt-build-control-0.7.0.tgz",
       "dependencies": {
         "shelljs": {
           "version": "0.2.6",
@@ -1481,14 +1481,14 @@
       }
     },
     "grunt-exec": {
-      "version": "0.4.7",
-      "from": "grunt-exec@>=0.4.6 <0.5.0",
-      "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.7.tgz"
+      "version": "1.0.0",
+      "from": "grunt-exec@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-1.0.0.tgz"
     },
     "grunt-html": {
-      "version": "7.1.0",
-      "from": "grunt-html@>=7.0.0 <8.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-7.1.0.tgz",
+      "version": "8.0.1",
+      "from": "grunt-html@>=8.0.1 <9.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-8.0.1.tgz",
       "dependencies": {
         "async": {
           "version": "1.5.2",
@@ -1554,9 +1554,9 @@
       "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.1.0.tgz",
       "dependencies": {
         "semver": {
-          "version": "5.1.1",
+          "version": "5.2.0",
           "from": "semver@>=5.1.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.1.tgz"
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz"
         }
       }
     },
@@ -1605,9 +1605,9 @@
       }
     },
     "grunt-stamp": {
-      "version": "0.1.0",
-      "from": "grunt-stamp@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/grunt-stamp/-/grunt-stamp-0.1.0.tgz"
+      "version": "0.2.0",
+      "from": "grunt-stamp@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/grunt-stamp/-/grunt-stamp-0.2.0.tgz"
     },
     "gzip-size": {
       "version": "1.0.0",
@@ -1757,7 +1757,7 @@
     },
     "inherits": {
       "version": "2.0.1",
-      "from": "inherits@>=2.0.0 <3.0.0",
+      "from": "inherits@>=2.0.1 <2.1.0",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
     },
     "inquirer": {
@@ -1931,9 +1931,9 @@
       "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
     },
     "jquery": {
-      "version": "2.2.4",
-      "from": "jquery@>=1.9.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz"
+      "version": "3.0.0",
+      "from": "jquery@>=1.9.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.0.0.tgz"
     },
     "js-base64": {
       "version": "2.1.9",
@@ -3316,7 +3316,7 @@
     },
     "shx": {
       "version": "0.1.2",
-      "from": "shx@latest",
+      "from": "shx@>=0.1.2 <0.2.0",
       "resolved": "https://registry.npmjs.org/shx/-/shx-0.1.2.tgz"
     },
     "sigmund": {

package.json

@@ -46,7 +46,7 @@
     "eslint": "^2.11.1",
     "grunt": "^0.4.5",
     "grunt-babel": "^5.0.3",
-    "grunt-build-control": "^0.6.0",
+    "grunt-build-control": "^0.7.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-compress": "^1.1.0",
     "grunt-contrib-concat": "^1.0.0",
@@ -57,13 +57,13 @@
     "grunt-contrib-sass": "^1.0.0",
     "grunt-contrib-uglify": "^1.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-exec": "^0.4.6",
-    "grunt-html": "^7.0.0",
+    "grunt-exec": "^1.0.0",
+    "grunt-html": "^8.0.1",
     "grunt-jekyll": "^0.4.2",
     "grunt-sass": "^1.0.0",
     "grunt-saucelabs": "^8.6.1",
     "grunt-scss-lint": "^0.3.8",
-    "grunt-stamp": "^0.1.0",
+    "grunt-stamp": "^0.2.0",
     "is-travis": "^1.0.0",
     "jscs": "^3.0.4",
     "load-grunt-tasks": "^3.4.0",