Require-compatible Vite build

Author: randomdevpete

crawl-ref/.gitignore

@@ -114,8 +114,7 @@ chunk
 /source/webserver/game_data/static/player.png
 /source/webserver/game_data/static/gui.png
 /source/webserver/game_data/static/icons.png
-/source/webserver/game_data/static/tileinfo-*.js
-/source/webserver/game_data/static/game.js
+/source/webserver/game_data/static/*.js
 /source/webserver/static/stone_soup_icon-32x32.png
 /source/webserver/static/title_*.png
 /source/webserver/static/*.js

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

@@ -11,10 +11,11 @@
     "lint:fix": "biome lint --write --unsafe",
     "format": "biome format",
     "preview": "vite preview",
-    "copy": "cp dist/static/* ../../game_data/static"
+    "copy": "cp dist/* ../../game_data/static"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.2.6",
+    "glob": "^11.0.3",
     "typescript": "~5.9.3",
     "vite": "^7.1.7"
   },

crawl-ref/source/webserver/client/game/vite.config.js

@@ -1,19 +1,38 @@
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { globSync } from "glob";
+
 export default {
   build: {
     lib: {
-      entry: "src/main.js",
-      formats: ["iife"],
+      entry: "src/*.js",
+      formats: ["amd"],
       name: "DCSSGame",
     },
     modulePreload: false,
-    assetsDir: "static",
     sourcemap: true,
+    minify: false,
     rollupOptions: {
-      input: "src/main.js",
+      input: Object.fromEntries(
+        globSync("src/*.js").map((file) => [
+          // This removes `src/` as well as the file extension from each
+          // file, so e.g. src/nested/foo.js becomes nested/foo
+          path.relative(
+            "src",
+            file.slice(0, file.length - path.extname(file).length),
+          ),
+          // This expands the relative paths to absolute paths, so e.g.
+          // src/nested/foo becomes /project/src/nested/foo.js
+          fileURLToPath(new URL(file, import.meta.url)),
+        ]),
+      ),
       output: {
-        entryFileNames: "static/game.js",
+        entryFileNames: "[name].js",
+        amd: {
+          // autoId: true,
+        },
         globals: {
-          jquery: "jQuery",
+          jquery: "$",
           client: "DCSS.client",
           comm: "DCSS.comm",
           key_conversion: "DCSS.key_conversion",

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

@@ -11,11 +11,12 @@
     "lint:fix": "biome lint --write --unsafe",
     "format": "biome format",
     "preview": "vite preview",
-    "copy": "cp dist/index.html ../../templates/client.html && cp dist/static/* ../../static"
+    "copy": "cp -r dist/* ../../static"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.2.6",
     "@types/jquery": "1.x",
+    "glob": "^11.0.3",
     "typescript": "~5.9.3",
     "vite": "^7.1.7"
   },

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

@@ -7,7 +7,6 @@ import "./contrib/inflate";
 
 import chat from "./chat";
 import comm from "./comm";
-import { define, requirejs } from "./contrib/require";
 import key_conversion from "./key_conversion";
 
 const client = {};
@@ -40,7 +39,7 @@ let next_loading_img_shown = true;
 const send_message = comm.send_message;
 
 let game_version = null;
-let game_script = null;
+const game_script = null;
 let loaded_modules = null;
 let text_decoder = null;
 if ("TextDecoder" in window) text_decoder = new TextDecoder("utf-8");
@@ -1245,7 +1244,7 @@ function set_html(data) {
   $(`#${data.id}`).html(data.content);
 }
 
-requirejs.onResourceLoad = (_context, map, _depArray) => {
+require.onResourceLoad = (_context, map, _depArray) => {
   if (loaded_modules != null) loaded_modules.push(map.id);
 };
 
@@ -1279,19 +1278,22 @@ function receive_game_client(data) {
     });
   };
 
+  // window.define = define;
+  // window.require = requirejs;
+
   const patchLegacyRequire = () => {
-    define("comm", () => comm);
-    define("client", () => client);
-    define("key_conversion", () => key_conversion);
+    // define("comm", () => comm);
+    // define("chat", () => chat);
+    // define("client", () => client);
+    // define("key_conversion", () => key_conversion);
     define("jquery", () => $);
     define("contrib/jquery.json", () => {
       $.toJSON = (obj) => JSON.stringify(obj);
     });
-    window.define = define;
-    window.require = requirejs;
   };
 
   if (data.content.indexOf("<!-- DCSS.WebTiles.v2 -->") >= 0) {
+    patchLegacyRequire();
     // New version. There is maybe a less hacky way to make ourselves available
     // to the game but this also works.
     window.DCSS ??= {};
@@ -1302,10 +1304,20 @@ function receive_game_client(data) {
     window.jQuery = $;
     inhibit_messages();
     $("#game").html(data.content);
-    const script = document.createElement("script");
-    script.src = `/gamedata/${data.version}/game.js`;
-    document.head.appendChild(script);
-    game_script = script;
+
+    requirejs.config({
+      paths: { [`game-${game_version}`]: `/gamedata/${game_version}` },
+    });
+    require([`game-${game_version}/main`], (main) => {
+      // $(document).trigger("game_preinit");
+      // $(document).trigger("game_init");
+      // client.uninhibit_messages();
+    });
+
+    // const script = document.createElement("script");
+    // script.src = `/gamedata/${data.version}/game.js`;
+    // document.head.appendChild(script);
+    // game_script = script;
     waitForImages();
   } else if (data.content.indexOf("game_loading") === -1) {
     patchLegacyRequire();