refactor scripts (#468)

simonLeary42 · web-flow · commit 71debb34e1e8 · 2025-12-29T14:26:18.000-05:00
diff --git a/package.json b/package.json
@@ -11,15 +11,15 @@
   "copyFiles": [
     {
       "from": "node_modules/jquery/dist/jquery.min.js",
-      "to": "webroot/js/jquery-3.7.1.min.js"
+      "to": "webroot/js/jquery.min.js"
     },
     {
       "from": "node_modules/ckeditor5/dist/browser/ckeditor5.umd.js",
-      "to": "webroot/js/ckeditor5-47.3.0.min.js"
+      "to": "webroot/js/ckeditor5.umd.js"
     },
     {
       "from": "node_modules/ckeditor5/dist/browser/ckeditor5.css",
-      "to": "webroot/css/ckeditor5-47.3.0.css"
+      "to": "webroot/css/ckeditor5.css"
     }
   ]
 }
diff --git a/resources/templates/footer.php b/resources/templates/footer.php
@@ -31,7 +31,7 @@
 </body>
 <?php
 foreach (["filter", "sort", "global-late", "tables", "messages"] as $x) {
-    $url = getURL("js/$x.js?v=" . CONFIG["upstream"]["version"]);
+    $url = getURL("js/$x.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);
     echo "<script src='$url'></script>";
 }
 ?>
diff --git a/resources/templates/header.php b/resources/templates/header.php
@@ -36,19 +36,12 @@
 <html lang="en">
 
 <head>
-  <script
-    src="<?php echo getURL("js/jquery-3.7.1.min.js"); ?>"
-    integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs"
-    crossorigin="anonymous"
-  >
-  </script>
-  <script
-    src="<?php echo getURL("js/ckeditor5-47.3.0.min.js"); ?>"
-    integrity="sha384-vfrZDzuxNDOwwU8jB6WLBRm2Y37beBm82JEKPRi7i0ntHlWOiXcKCD/d9TEJldOb"
-    crossorigin="anonymous"
-  >
-  </script>
-  <link rel='stylesheet' type='text/css' href='<?php echo getURL("css/ckeditor5-47.3.0.css") ?>' />
+  <?php
+    foreach (["jquery.min", "global-early", "ckeditor5.umd"] as $x) {
+        $url = getURL("js/$x.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);
+        echo "<script src='$url'></script>";
+    }
+    ?>
   <style>
     <?php
     // set global css variables from branding
@@ -61,8 +54,8 @@
   </style>
 
   <?php
-    foreach (["global", "navbar", "modal", "tables", "filters", "messages"] as $x) {
-        $url = getURL("css/$x.css?v=" . CONFIG["upstream"]["version"]);
+    foreach (["global", "navbar", "modal", "tables", "filters", "messages", "ckeditor5"] as $x) {
+        $url = getURL("css/$x.css?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);
         echo "<link rel='stylesheet' type='text/css' href='$url' />";
     }
     ?>
@@ -142,12 +135,9 @@
       <div class="modalBody"></div>
     </div>
   </div>
-  <?php
-    foreach (["modal", "global-early"] as $x) {
-        $url = getURL("js/$x.js?v=" . CONFIG["upstream"]["version"]);
-        echo "<script src='$url'></script>";
-    }
-    ?>
+  <script
+    src="<?php echo getURL("js/modal.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]) ?>"
+  ></script>
   <main>
 
   <?php

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,15 @@`
`11`	`11`	`"copyFiles": [`
`12`	`12`	`{`
`13`	`13`	`"from": "node_modules/jquery/dist/jquery.min.js",`
`14`		`- "to": "webroot/js/jquery-3.7.1.min.js"`
	`14`	`+ "to": "webroot/js/jquery.min.js"`
`15`	`15`	`},`
`16`	`16`	`{`
`17`	`17`	`"from": "node_modules/ckeditor5/dist/browser/ckeditor5.umd.js",`
`18`		`- "to": "webroot/js/ckeditor5-47.3.0.min.js"`
	`18`	`+ "to": "webroot/js/ckeditor5.umd.js"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"from": "node_modules/ckeditor5/dist/browser/ckeditor5.css",`
`22`		`- "to": "webroot/css/ckeditor5-47.3.0.css"`
	`22`	`+ "to": "webroot/css/ckeditor5.css"`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`</body>`
`32`	`32`	`<?php`
`33`	`33`	`foreach (["filter", "sort", "global-late", "tables", "messages"] as $x) {`
`34`		`- $url = getURL("js/$x.js?v=" . CONFIG["upstream"]["version"]);`
	`34`	`+ $url = getURL("js/$x.js?cache_bust_increment_me=" . CONFIG["upstream"]["version"]);`
`35`	`35`	`echo "<script src='$url'></script>";`
`36`	`36`	`}`
`37`	`37`	`?>`