BREAKING CHANGE: DEV, SUBMODULES

- the utils package is folded into the server package. it is no longer separate. The code is moved to utils.ts
- an improved esbuild process for the client which supports multiple client builds. the public files are moved into the public folder in rootdir, and publicdir is considered cleanable now (although clean still needs to be specified in the esbuild).
- the esbuild.context.mjs file format has changed and been renamed to esbuild.options.mjs

Author: Arlen22

package-lock.json

@@ -55,6 +55,7 @@
     "@prisma/adapter-better-sqlite3": "6.10.1",
     "@serenity-kit/opaque": "^0.8.4",
     "@tiddlywiki/mws-prisma": "file:prisma/client",
+    "@types/source-map-support": "^0.5.10",
     "source-map-support": "^0.5.21",
     "tiddlywiki": "^5.3.2"
   },
@@ -70,4 +71,4 @@
   "peerDependencies": {
     "tiddlywiki": "^5.3.2"
   }
-}
+}

package.json

@@ -1,10 +1,9 @@
 import { Prisma } from '@tiddlywiki/mws-prisma';
 import { Types } from '@tiddlywiki/mws-prisma/runtime/library';
 import { ServerState } from "./ServerState";
-import { BodyFormat, ParsedRequest, RouteMatch, Router, ServerRequest, Streamer } from "@tiddlywiki/server";
+import { BodyFormat, ParsedRequest, RouteMatch, Router, ServerRequest, Streamer, truthy } from "@tiddlywiki/server";
 import { SendError, SendErrorReasonData } from "@tiddlywiki/server";
 import { ServerToReactAdmin } from './services/setupDevServer';
-import { truthy } from '@tiddlywiki/utils';
 import { AuthUser } from './services/sessions';
 
 
@@ -52,8 +51,8 @@ export class StateObject<
     this.pluginCache = router.config.pluginCache;
 
     this.asserted = false;
-    this.sendAdmin = (status: number, response: ServerToReactAdmin) =>
-      router.sendAdmin(this, status, response);
+    this.sendAdmin = (status: number, response: ServerToReactAdmin): Promise<typeof STREAM_ENDED> =>
+      router.sendAdmin(this as ServerRequest<B, M, D>, status, response);
 
     if (this.compressor)
       this.compressor.enabled = router.config.enableGzip;

packages/mws/src/RequestState.ts

@@ -4,8 +4,6 @@ import * as load_archive from "./load-archive";
 import * as init_store from "./init-store";
 import * as manager from "./manager";
 import * as tests_complete from "./tests-complete";
-import * as build_client from "./build-client";
-import * as build_types from "./build-types";
 import * as listen from "./listen";
 import { BaseCommand, CommandInfo } from "@tiddlywiki/commander";
 import { serverEvents } from "@tiddlywiki/events";
@@ -19,8 +17,6 @@ export const commands = {
   init_store,
   manager,
   tests_complete,
-  build_client,
-  build_types,
 } as const satisfies Record<string, {
   info: CommandInfo,
   Command: {

packages/mws/src/commands/build-client.ts

@@ -1,13 +1,7 @@
 
-import { BodyFormat, ListenerHTTP, ListenerHTTPS, Router, startListening, Z2, zod } from "@tiddlywiki/server";
+import { Router, startListening, Z2, zod, truthy, createRootRoute } from "@tiddlywiki/server";
 import { BaseCommand, CommandInfo } from "@tiddlywiki/commander";
-
-import { fromError } from "zod-validation-error";
 import { serverEvents } from "@tiddlywiki/events";
-import { ServerRoute } from "@tiddlywiki/server";
-import { createRootRoute } from "@tiddlywiki/server";
-import { ServerState } from "../ServerState";
-import { truthy } from "@tiddlywiki/utils";
 
 serverEvents.on("cli.register", (commands) => {
   commands.listen = { info, Command };

packages/mws/src/commands/index.ts

@@ -4,7 +4,7 @@ import { CacheState } from "../services/cache";
 import { TiddlerFields, TW } from "tiddlywiki";
 import * as fs from "fs";
 import * as path from "path";
-import { truthy } from "@tiddlywiki/utils";
+import { truthy } from "@tiddlywiki/server";
 
 
 export const info: CommandInfo = {

packages/mws/src/commands/listen.ts

@@ -1,5 +1,6 @@
 import "./globals";
-import "@tiddlywiki/utils";
+import { install } from "source-map-support";
+install();
 import { serverEvents } from "@tiddlywiki/events";
 
 // these all use serverEvents

packages/mws/src/commands/load-wiki-folder.ts

@@ -1,7 +1,5 @@
 import { TiddlerFields } from "tiddlywiki";
-import { zod } from "@tiddlywiki/server";
-import { SendError } from "@tiddlywiki/server";
-import { Tuple } from "@tiddlywiki/utils";
+import { zod, SendError, Tuple } from "@tiddlywiki/server";
 
 /**
  * 	

packages/mws/src/index.ts

@@ -7,10 +7,9 @@ import "./user-status";
 
 // other imports
 import { admin } from "./admin-utils";
-import { RouterKeyMap, RouterRouteMap, ServerRoute, registerZodRoutes } from "@tiddlywiki/server";
+import { RouterKeyMap, RouterRouteMap, ServerRoute, registerZodRoutes,truthy } from "@tiddlywiki/server";
 import { ServerState } from "../ServerState";
 import { serverEvents } from "@tiddlywiki/events";
-import { truthy } from "@tiddlywiki/utils";
 
 export * from "./admin-recipes";
 export * from "./admin-users";