fix stats and dev bug

Author: Arlen22

packages/mws/src/services/setupDevServer.ts

@@ -1,7 +1,7 @@
 import { existsSync, rm, rmSync, writeFileSync } from "fs";
 // import { buildOptions } from "./context";
 import { request } from "http";
-import { readFile } from "fs/promises";
+import { readFile, writeFile } from "fs/promises";
 import { basename, join, relative, resolve } from "path";
 import { checkPath, dist_resolve, SendError, SendErrorReasonData, ServerRequest, ServerRoute } from "@tiddlywiki/server";
 import { createHash } from "crypto";
@@ -63,7 +63,7 @@ function parseMetafileEntryPoints({ entryPoints, result, publicdir }: {
     relative(publicdir, e[1].cssBundle!)
   );
 
-  writeFileSync(publicdir + ".json", JSON.stringify(result.metafile));
+
 
   const maxwidth = outputs.reduce((a, [b]) => Math.max(a, b.length), 0);
 
@@ -162,9 +162,9 @@ export async function runBuildOnce({ rootdir, publicdir }: { rootdir: string; pu
   // errors cause this to reject
   const result = await esbuild.build(options);
   console.timeEnd(timeTag);
-
   const { js, css } = parseMetafileEntryPoints({ entryPoints, result, publicdir });
 
+  await writeFile(publicdir + ".json", JSON.stringify(result.metafile));
   await generateHtml({ js, css, rootdir, publicdir });
 
   return result;
@@ -196,6 +196,7 @@ async function startDevServer({ rootdir, publicdir }: { rootdir: string; publicd
     // errors cause this to reject
     const result = await ctx.rebuild();
     const { css, js } = parseMetafileEntryPoints({ entryPoints, result, publicdir });
+    await writeFile(publicdir + ".json", JSON.stringify(result.metafile));
     await generateHtml({ js, css, rootdir, publicdir });
   }
 
@@ -204,8 +205,8 @@ async function startDevServer({ rootdir, publicdir }: { rootdir: string; publicd
   return async function sendDevServer(state: ServerRequest, indexOptions?: { status: number, serverResponse: ServerToReactAdmin }): Promise<typeof STREAM_ENDED> {
     // this will rebuild the html on page load
     // if the build fails, esbuild will serve the error so we just ignore it
-
-    if (state.headers["sec-fetch-dest"] === "document") await rebuild().catch(() => { });
+    if (state.headers["sec-fetch-dest"] === "document")
+      await rebuild().catch((e) => { if (!(e.errors && e.warnings)) throw e; });
 
     if (indexOptions) return await serveIndex({ state, publicdir, status: indexOptions.status, serverResponse: indexOptions.serverResponse });
 

packages/react-admin/esbuild.options.mjs

@@ -1,19 +1,22 @@
-
+//@ts-check
 import { basename, join, resolve } from 'node:path';
 import { copy } from 'esbuild-plugin-copy';
 import { existsSync } from 'node:fs';
 
 /**
  * @template {import('esbuild').BuildOptions} T
- * @param {Promise<import('esbuild').SameShape<import('esbuild').BuildContext, T>>} options 
+ * @param {import('esbuild').SameShape<import('esbuild').BuildOptions, T>} options 
  * @returns 
  */
 function optionsTyped(options) {
   return options;
 }
 
-
-export default async function({rootdir, publicdir}) {
+/**
+ * 
+ * @param {{rootdir: string, publicdir: string}} param0 
+ */
+export default async function({ rootdir, publicdir }) {
 
   /** @type {{in: string; out: string;}[]} */
   const entryPoints = [
@@ -27,7 +30,7 @@ export default async function({rootdir, publicdir}) {
   });
 
   const options = optionsTyped({
-    entryPoints: [resolve(rootdir, 'src/main.tsx')],
+    entryPoints,
     bundle: true,
     target: 'es2020',
     platform: 'browser',
@@ -43,9 +46,6 @@ export default async function({rootdir, publicdir}) {
         assets: [{
           from: [join(rootdir, "public", "**/*")],
           to: ['.'],
-        }, {
-          from: [join(rootdir, "index.html")],
-          to: ['../' + basename(publicdir) + ".html"]
         }],
       }),
     ]

packages/react-admin/src/main.tsx

@@ -13,7 +13,7 @@ declare global {
   const BUILD_VERSION: string;
 }
 
-const theme = createTheme({
+const theme = creat eTheme({
   palette: {
     background: {
       default: "#f0f0f0",

public/.gitignore

@@ -1,4 +1,6 @@
 # This is where the client build output goes. 
-*
-!.gitignore
-!.default.html
+/**/
+/*
+!/.gitignore
+!/.default.html
+!/stats