Merge pull request #19029 from twbs/v4-dev-xmr-grunt-html

Update grunt-html

10 files changed, 14 insertions, 22 deletions

diff --git a/.travis.yml b/.travis.yml
index b57eb6c26..f87759abd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
-sudo: false
+sudo: required
+dist: trusty
 language: node_js
 git:
   depth: 10
diff --git a/Gruntfile.js b/Gruntfile.js
index 31068766c..67cbc5078 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -327,8 +327,7 @@ module.exports = function (grunt) {
           '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.',
-          'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.',
-          'Attribute “integrity” not allowed on element “script” at this point.' // Until https://github.com/jzaefferer/grunt-html/issues/86 gets fixed
+          'The “week” input type is not supported in all browsers. Please be sure to test, and consider using a polyfill.'
         ]
       },
       src: ['_gh_pages/**/*.html', 'js/tests/visual/*.html']
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 3b912c322..561d4110c 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -1,4 +1,4 @@
-<footer class="bd-footer text-muted" role="contentinfo">
+<footer class="bd-footer text-muted">
   <div class="container">
     <ul class="bd-footer-links">
       <li><a href="{{ site.repo }}">GitHub</a></li>
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html
index a347a5f7c..0436e2dbe 100644
--- a/docs/_includes/nav-home.html
+++ b/docs/_includes/nav-home.html
@@ -1,4 +1,4 @@
-<header class="navbar navbar-light navbar-static-top bd-navbar" role="banner">
+<header class="navbar navbar-light navbar-static-top bd-navbar">
   <div class="container">
     {% comment %}
     <nav class="nav navbar-nav pull-xs-right">
diff --git a/docs/components/scrollspy.md b/docs/components/scrollspy.md
index 4ae0fa219..622469aa1 100644
--- a/docs/components/scrollspy.md
+++ b/docs/components/scrollspy.md
@@ -14,7 +14,7 @@ group: components
 The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.
 
 <div class="bd-example">
-  <nav id="navbar-example2" class="navbar navbar-default" role="navigation">
+  <nav id="navbar-example2" class="navbar navbar-default">
     <h3 class="navbar-brand">Project Name</h3>
     <ul class="nav nav-pills">
       <li class="nav-item"><a class="nav-link" href="#fat">@fat</a></li>
diff --git a/docs/index.html b/docs/index.html
index dee656788..6f88f4254 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3,7 +3,7 @@ layout: home
 title: Bootstrap &middot; The world's most popular mobile-first and responsive front-end framework.
 ---
 
-<main class="bd-masthead" id="content" role="main">
+<main class="bd-masthead" id="content">
   <div class="container">
     <span class="bd-booticon outline">B</span>
     <p class="lead">Bootstrap is the most popular HTML, CSS, and JS framework in the world for building responsive, mobile-first projects on the web.</p>
diff --git a/grunt/npm-shrinkwrap.json b/grunt/npm-shrinkwrap.json
index eb4c9acc1..85d08952f 100644
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@@ -1173,20 +1173,12 @@
       "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz"
     },
     "grunt-html": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-5.0.1.tgz",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-html/-/grunt-html-6.0.0.tgz",
       "dependencies": {
         "async": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz"
-        },
-        "chalk": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz"
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.1.tgz"
         }
       }
     },
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index f0d6f159e..11474728e 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -15,7 +15,7 @@
     <h1>Dropdown <small>Bootstrap Visual Test</small></h1>
   </div>
 
-  <nav id="navbar-example" class="navbar navbar-light bg-faded" role="navigation">
+  <nav id="navbar-example" class="navbar navbar-light bg-faded">
     <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#exCollapsingNavbar2">
       &#9776;
     </button>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index dc1dfc82f..efe6f593b 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -14,7 +14,7 @@
 
 <div class="container">
 
-  <nav class="navbar navbar-dark navbar-fixed-top bg-inverse" role="navigation">
+  <nav class="navbar navbar-dark navbar-fixed-top bg-inverse">
     <div class="js-navbar-scrollspy">
       <ul class="nav navbar-nav">
         <li class="nav-item"><a class="nav-link active" href="#fat">@fat</a></li>
diff --git a/package.json b/package.json
index b2494c6e2..d02e6d6a6 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "grunt-contrib-watch": "~0.6.1",
     "grunt-eslint": "^17.1.0",
     "grunt-exec": "~0.4.6",
-    "grunt-html": "~5.0.0",
+    "grunt-html": "~6.0.0",
     "grunt-jekyll": "~0.4.2",
     "grunt-jscs": "~2.7.0",
     "grunt-line-remover": "0.0.2",