handle globals in a less wasteful way (and fix menus)

Author: randomdevpete

crawl-ref/source/webserver/client/game/package.json

@@ -19,7 +19,6 @@
     "vite": "^7.1.7"
   },
   "dependencies": {
-    "focus-trap": "^7.6.5",
-    "jquery": "^1.12.4"
+    "focus-trap": "^7.6.5"
   }
 }

crawl-ref/source/webserver/client/game/src/action_panel.js

@@ -1,18 +1,16 @@
-import $ from "jquery";
+import client from "client";
+import comm from "comm";
 import { createFocusTrap } from "focus-trap";
-
-import comm from "./comm";
-import client from "./client";
-
+import $ from "jquery";
+import gui from "../../../game_data/static/tileinfo-gui";
+import icons from "../../../game_data/static/tileinfo-icons";
+import main from "../../../game_data/static/tileinfo-main";
 import cr from "./cell_renderer";
 import enums from "./enums";
 import options from "./options";
 import player from "./player";
-import icons from "../../../game_data/static/tileinfo-icons";
-import gui from "../../../game_data/static/tileinfo-gui";
-import main from "../../../game_data/static/tileinfo-main";
-import util from "./util";
 import ui from "./ui";
+import util from "./util";
 
 let filtered_inv;
 let renderer, $canvas, $settings, $tooltip;

crawl-ref/source/webserver/client/game/src/client.js

@@ -1,11 +1,10 @@
+import c from "client";
 import $ from "jquery";
-
-import c from "./client";
+import display from "./display";
 import r from "./dungeon_renderer";
+import mk from "./map_knowledge";
 import mm from "./minimap";
 import ml from "./monster_list";
-import mk from "./map_knowledge";
-import display from "./display";
 
 const exports = {};
 

crawl-ref/source/webserver/client/game/src/comm.js

@@ -1,11 +1,9 @@
+import comm from "comm";
 import $ from "jquery";
-
-import comm from "./comm";
-
+import dungeon_renderer from "./dungeon_renderer";
 import map_knowledge from "./map_knowledge";
-import monster_list from "./monster_list";
 import minimap from "./minimap";
-import dungeon_renderer from "./dungeon_renderer";
+import monster_list from "./monster_list";
 
 function invalidate(minimap_too) {
   const b = map_knowledge.bounds();

crawl-ref/source/webserver/client/game/src/debug.js

@@ -1,14 +1,12 @@
+import comm from "comm";
 import $ from "jquery";
-
-import comm from "./comm";
-
+import dngn from "../../../game_data/static/tileinfo-dngn";
 import cr from "./cell_renderer";
+import enums from "./enums";
 import map_knowledge from "./map_knowledge";
 import options from "./options";
-import dngn from "../../../game_data/static/tileinfo-dngn";
 import util from "./util";
 import view_data from "./view_data";
-import enums from "./enums";
 
 let global_anim_counter = 0;
 

crawl-ref/source/webserver/client/game/src/display.js

@@ -1,11 +1,10 @@
+import client from "client";
+import comm from "comm";
 import $ from "jquery";
-
-import client from "./client";
-import comm from "./comm";
+import key_conversion from "key_conversion";
 import display from "./display";
 import dungeon_renderer from "./dungeon_renderer";
 import enums from "./enums";
-import key_conversion from "./key_conversion";
 import messages from "./messages";
 import minimap from "./minimap";
 import mouse_control from "./mouse_control";

crawl-ref/source/webserver/client/game/src/dungeon_renderer.js

@@ -5,8 +5,8 @@
 // import "./simplebar.css";
 import "./game";
 
+import client from "client";
 import $ from "jquery";
-import client from "./client";
 
 // Game initialisation (moved from inline script in html template)
 $(document).trigger("game_preinit");