Merge pull request #2537 from WPO-Foundation/vendorize

Version and move vendor JS into assets/js/vendor/

.prettierignore

@@ -1,7 +1,3 @@
 www/chrome
 www/assets/css/vendor
-www/assets/js/catchpoint-rum.js
-www/assets/js/dygraph-combined.js
-www/assets/js/codeflask.module.js
-www/assets/js/jquery.js
-www/assets/js/prism.js
+www/assets/js/vendor

www/assets/js/site.js

@@ -281,7 +281,9 @@ async function initCodeField(source, language = "js") {
     return; // already initialized
   }
   // load Flask
-  const { default: CodeFlask } = await import("/assets/js/codeflask.module.js");
+  const { default: CodeFlask } = await import(
+    "/assets/js/vendor/codeflask-1.4.1.module.js"
+  );
   const originalTextarea = document.getElementById(source);
   // editor container
   const codeEl = document.createElement("div");
@@ -311,10 +313,10 @@ async function loadPrism() {
   const ss = document.createElement("link");
   ss.rel = "stylesheet";
   ss.type = "text/css";
-  ss.href = "/assets/css/vendor/prism.css";
+  ss.href = "/assets/css/vendor/prism-1.29.0.css";
   document.head.appendChild(ss);
 
   // todo: find a Prism distro that is a proper module
-  await import("/assets/js/prism.js");
+  await import("/assets/js/vendor/prism-1.29.0.js");
   return window.Prism;
 }

www/footer.inc

@@ -36,7 +36,7 @@
     </footer>
     <?php
     if (!isset($site_js_loaded) || !$site_js_loaded) {
-        echo "<script src=\"{$GLOBALS['cdnPath']}/assets/js/jquery.js\"></script>\n";
+        echo "<script src=\"{$GLOBALS['cdnPath']}/assets/js/vendor/jquery-1.7.1.js\"></script>\n";
         echo "<script src=\"{$GLOBALS['cdnPath']}/assets/js/site.js?v=" . VER_JS . "\"></script>\n";
         $hasJquery = true;
     }

www/head.inc

@@ -111,7 +111,7 @@ echo "\n</style>\n";
 // include the analytics code if it is appropriate
 if (!isset($noanalytics)) {
     echo "<script>";
-    require_once WWW_PATH . '/assets/js/catchpoint-rum.js';
+    require_once WWW_PATH . '/assets/js/vendor/catchpoint-rum.js';
     echo "</script>";
 }
 

www/templates/layouts/footer.inc

@@ -27,7 +27,7 @@ if (!strcasecmp('Test Result', $tab) && (!isset($nosubheader) || !@$nosubheader)
 
 <?php
 if (!isset($site_js_loaded) || !$site_js_loaded) {
-    echo "<script src=\"{$GLOBALS['cdnPath']}/assets/js/jquery.js\"></script>\n";
+    echo "<script src=\"{$GLOBALS['cdnPath']}/assets/js/vendor/jquery-1.7.1.js\"></script>\n";
     echo "<script src=\"{$GLOBALS['cdnPath']}/assets/js/site.js?v=" . constant('VER_JS') . "\"></script>\n";
     $hasJquery = true;
 }

www/templates/layouts/head.inc

@@ -117,7 +117,7 @@ echo "\n</style>\n";
 // include the analytics code if it is appropriate
 if (!isset($noanalytics)) {
     echo '<script>';
-    require_once __DIR__ . '/../../assets/js/catchpoint-rum.js';
+    require_once __DIR__ . '/../../assets/js/vendor/catchpoint-rum.js';
     echo '</script>';
 }