Embed JS: fix incompatibilities with sphinx 6.x (jquery removal)

readthedocs/core/static-src/core/js/doc-embed/search.js

@@ -40,6 +40,20 @@ function attach_elastic_search_query_sphinx(data) {
         /**
          * Build a section with its matching results.
          *
+         * A section has the form:
+         *
+         *   <div>
+         *     <a href={link}>{title}<a>
+         *   </div>
+         *   <div>
+         *     {contents[0]}
+         *   </div>
+         *   <div>
+         *     {contents[1]}
+         *   </div>
+         *
+         *   ...
+         *
          * @param {String} title.
          * @param {String} link.
          * @param {Array} contents.
@@ -61,6 +75,14 @@ function attach_elastic_search_query_sphinx(data) {
 
         /**
          * Build a domain section.
+         * A domain section has the form:
+         *
+         *   <div>
+         *     <a href={link}>{title}<a>
+         *   </div>
+         *   <div>
+         *     {content}
+         *   </div>
          *
          * @param {String} title.
          * @param {String} link.

readthedocs/core/static-src/core/js/readthedocs-doc-embed.js

@@ -7,8 +7,9 @@ var sphinx = require('./doc-embed/sphinx');
 var search = require('./doc-embed/search');
 
 
-// While much of this script relies on jQuery (which Sphinx relies on),
-// we purposefully do not use it before DOMContentLoaded in case scripts are loaded out of order
+// Parts of this script rely on jQuery,
+// since Sphinx no longer includes it,
+// we must inject it if isn't found before executing our script.
 (function () {
     function domReady(fn) {
         // If the DOM is already done parsing
@@ -26,15 +27,19 @@ var search = require('./doc-embed/search');
         sponsorship.init();
     }
 
-    // Inject JQuery if isn't present already.
-    if (!window.jQuery) {
-        console.log("JQuery not found. Injecting.");
-        var script = document.createElement("script");
-        script.type = 'text/javascript';
-        script.src = "https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js";
-        script.onload = function () { domReady(init); };
-        document.head.appendChild(script);
-    } else {
-        domReady(init);
-    }
+    domReady(function () {
+      // Inject JQuery if isn't present already.
+      if (!window.jQuery) {
+          console.log("JQuery not found. Injecting.");
+          var script = document.createElement("script");
+          script.type = "text/javascript";
+          script.src = "https://code.jquery.com/jquery-3.6.0.min.js";
+          script.integrity = "sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==";
+          script.crossOrigin = "anonymous";
+          script.onload = init;
+          document.head.appendChild(script);
+      } else {
+          init();
+      }
+    });
 }());