docs: fix bundle SRI hash.

Also, remove popper.js from this script since it's not present in the repo.

diff --git a/_config.yml b/_config.yml
index 6bb6c1a257bb610e8691c442c7324124d2b41b2c..fdf8d47cd8eac3cfcf15c2363d488bc22760a44f 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -53,6 +53,8 @@ cdn:
   css_hash:         "sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO"
   js:               "https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
   js_hash:          "sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
+  js_bundle:        "https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.bundle.min.js"
+  js_bundle_hash:   "sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
   jquery:           "https://code.jquery.com/jquery-3.3.1.slim.min.js"
   jquery_hash:      "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
   popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"

diff --git a/build/generate-sri.js b/build/generate-sri.js
index 8d0fedc4abbd202643b77803cf57843393180451..b3331001a35d363c3e6c75b870608ab796ce3b72 100644 (file)
--- a/build/generate-sri.js
+++ b/build/generate-sri.js
@@ -36,8 +36,8 @@ const files = [
     configPropertyName: 'jquery_hash'
   },
   {
-    file: 'site/docs/4.1/assets/js/vendor/popper.min.js',
-    configPropertyName: 'popper_hash'
+    file: 'dist/js/bootstrap.bundle.min.js',
+    configPropertyName: 'js_bundle_hash'
   }
 ]
 

diff --git a/site/_includes/scripts.html b/site/_includes/scripts.html
index 346f97b00f2de2b64f10744fdb39f48dde552bbd..2bd5ec8bcc0bd277f1e01caacd3b34f8e1e070f8 100644 (file)
--- a/site/_includes/scripts.html
+++ b/site/_includes/scripts.html
@@ -2,7 +2,7 @@
 <script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
 
 {%- if site.github -%}
-  <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/dist/js/bootstrap.bundle.min.js" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script>
+  <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/dist/js/bootstrap.bundle.min.js" integrity="{{ site.cdn.js_bundle_hash }}" crossorigin="anonymous"></script>
 {%- else -%}
   <script src="{{ site.baseurl }}/docs/{{ site.docs_version }}/dist/js/bootstrap.bundle.js"></script>
 {%- endif -%}