merge queue: embarking main (96b9e0c) and #3581 together

apps/wing-console/console/app/CONTRIBUTING.md

@@ -0,0 +1,9 @@
+# Contributing to Wing Console
+
+## Start dev mode
+
+```sh
+pnpm dev
+```
+
+Also, you have to start the dev script on the `apps/wing-console/console/server` package.

apps/wing-console/console/app/package.json

@@ -11,7 +11,7 @@
   ],
   "scripts": {
     "preview": "node scripts/preview.mjs",
-    "dev": "node scripts/dev.mjs",
+    "dev": "tsx watch scripts/dev.mjs",
     "compile": "tsup",
     "eslint": "eslint --ext .js,.cjs,.ts,.cts,.mts,.tsx --no-error-on-unmatched-pattern . --fix",
     "test": "playwright test --update-snapshots",

apps/wing-console/console/app/scripts/dev.mjs

@@ -15,19 +15,11 @@ const options = parseArgs({
   },
 });
 
-const vite = await createViteServer({
-  ...viteConfig,
-  server: { middlewareMode: true },
-});
-
-const { port } = await createConsoleServer({
+const consoleServer = await createConsoleServer({
   wingfile:
     options.values.wingfile ??
     fileURLToPath(new URL("../demo/index.w", import.meta.url)),
   requestedPort: 1214,
-  async onExpressCreated(app) {
-    app.use(vite.middlewares);
-  },
   log: {
     info: console.log,
     error: console.error,
@@ -49,6 +41,18 @@ const { port } = await createConsoleServer({
   requireAcceptTerms: true,
 });
 
-await open(`http://localhost:${port}`);
+const vite = await createViteServer({
+  ...viteConfig,
+  server: {
+    proxy: {
+      "/trpc": {
+        target: `http://localhost:${consoleServer.port}`,
+        changeOrigin: true,
+        ws: true,
+      },
+    },
+    open: true,
+  },
+});
 
-console.log(`Wing Console is running on http://localhost:${port}/`);
+await vite.listen();

apps/wing-console/console/server/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+# Contributing to `@wingconsole/server`
+
+## Start dev mode
+
+```sh
+pnpm dev
+```