Bump xo from 0.59.3 to 0.60.0 (#3181)

package.json

@@ -30,7 +30,7 @@
     "postcss": "^8.4.49",
     "postcss-cli": "^11.0.0",
     "prettier": "^3.4.2",
-    "xo": "^0.59.3"
+    "xo": "^0.60.0"
   },
   "browserslist": [
     "defaults",

scripts/js/charts.js

@@ -97,11 +97,11 @@ const htmlLegendPlugin = {
 
         textLink.addEventListener("click", () => {
           if (chart.canvas.id === "queryTypePieChart") {
-            window.location.href = "queries.lp?type=" + item.text;
+            globalThis.location.href = "queries.lp?type=" + item.text;
           } else if (chart.canvas.id === "forwardDestinationPieChart") {
             // Encode the forward destination as it may contain an "#" character
             const upstream = encodeURIComponent(upstreams[item.text]);
-            window.location.href = "queries.lp?upstream=" + upstream;
+            globalThis.location.href = "queries.lp?upstream=" + upstream;
           }
         });
       }

scripts/js/footer.js

@@ -424,7 +424,7 @@ function updateSystemInfo() {
 function apiFailure(data) {
   if (data.status === 401) {
     // Unauthorized, reload page
-    window.location.reload();
+    globalThis.location.reload();
   }
 }
 
@@ -596,7 +596,7 @@ function updateVersionInfo() {
 }
 
 $(function () {
-  if (window.location.pathname !== "/admin/login") updateInfo();
+  if (globalThis.location.pathname !== "/admin/login") updateInfo();
   var enaT = $("#enableTimer");
   var target = new Date(parseInt(enaT.html(), 10));
   var seconds = Math.round((target.getTime() - Date.now()) / 1000);
@@ -611,7 +611,7 @@ $(function () {
   // Apply per-browser styling settings
   initCheckboxRadioStyle();
 
-  if (window.location.pathname !== "/admin/login") {
+  if (globalThis.location.pathname !== "/admin/login") {
     // Run check immediately after page loading ...
     utils.checkMessages();
     // ... and then periodically
@@ -705,7 +705,7 @@ function applyExpertSettings() {
     //    functionality there), and
     //  - there are no visible boxes (the page is empty)
     if ($(".settings-selector").length > 0 && $(".box:visible").length === 0) {
-      window.location.href = "/admin/settings/system";
+      globalThis.location.href = "/admin/settings/system";
     }
   }
 }
@@ -715,7 +715,7 @@ function addAdvancedInfo() {
   const advancedInfoTarget = $("#advanced-info");
   const isTLS = advancedInfoSource.data("tls");
   const clientIP = advancedInfoSource.data("client-ip");
-  const XForwardedFor = window.atob(advancedInfoSource.data("xff") ?? "");
+  const XForwardedFor = globalThis.atob(advancedInfoSource.data("xff") ?? "");
   const starttime = parseFloat(advancedInfoSource.data("starttime"));
   const endtime = parseFloat(advancedInfoSource.data("endtime"));
   const totaltime = 1e3 * (endtime - starttime);

scripts/js/gravity.js

@@ -77,7 +77,7 @@ $(function () {
 
   // Do we want to start updating immediately?
   // gravity.lp?go
-  var searchString = window.location.search.substring(1);
+  var searchString = globalThis.location.search.substring(1);
   if (searchString.indexOf("go") !== -1) {
     $("#gravityBtn").prop("disabled", true);
     eventsource();

scripts/js/groups-clients.js

@@ -190,7 +190,7 @@ function initTable() {
       selectEl
         // fix dropdown if it would stick out right of the viewport
         .on("show.bs.select", function () {
-          var winWidth = $(window).width();
+          var winWidth = $(globalThis).width();
           var dropdownEl = $("body > .bootstrap-select.dropdown");
           if (dropdownEl.length > 0) {
             dropdownEl.removeClass("align-right");

scripts/js/groups-domains.js

@@ -236,7 +236,7 @@ function initTable() {
       selectEl
         // fix dropdown if it would stick out right of the viewport
         .on("show.bs.select", function () {
-          var winWidth = $(window).width();
+          var winWidth = $(globalThis).width();
           var dropdownEl = $("body > .bootstrap-select.dropdown");
           if (dropdownEl.length > 0) {
             dropdownEl.removeClass("align-right");

scripts/js/groups-lists.js

@@ -298,7 +298,7 @@ function initTable() {
       selectEl
         // fix dropdown if it would stick out right of the viewport
         .on("show.bs.select", function () {
-          var winWidth = $(window).width();
+          var winWidth = $(globalThis).width();
           var dropdownEl = $("body > .bootstrap-select.dropdown");
           if (dropdownEl.length > 0) {
             dropdownEl.removeClass("align-right");

scripts/js/index.js

@@ -790,7 +790,7 @@ $(function () {
       //get value by index
       var from = label / 1000 - 300;
       var until = label / 1000 + 300;
-      window.location.href = "queries.lp?from=" + from + "&until=" + until;
+      globalThis.location.href = "queries.lp?from=" + from + "&until=" + until;
     }
 
     return false;
@@ -813,7 +813,7 @@ $(function () {
       //get value by index
       var from = label / 1000 - 300;
       var until = label / 1000 + 300;
-      window.location.href = "queries.lp?from=" + from + "&until=" + until;
+      globalThis.location.href = "queries.lp?from=" + from + "&until=" + until;
     }
 
     return false;

scripts/js/interfaces.js

@@ -106,12 +106,10 @@ $(function () {
 
           if (addr.address_type !== undefined) {
             let familyextra = "";
-            if (addr.family !== undefined) {
-              if (addr.family === "inet") {
-                familyextra = "IPv4 ";
-              } else if (addr.family === "inet6") {
-                familyextra = "IPv6 ";
-              }
+            if (addr.family === "inet") {
+              familyextra = "IPv4 ";
+            } else if (addr.family === "inet6") {
+              familyextra = "IPv6 ";
             }
 
             extraaddr += " (" + familyextra + utils.escapeHtml(addr.address_type) + ")";