fix build

Author: michalsikora

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "clux",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": true,
   "license": "MIT",
   "description": "Clux — tmux session multiplexer with web dashboard and CLI.",
@@ -10,7 +10,7 @@
     "packages/web"
   ],
   "scripts": {
-    "build": "npm run build:core && npm run build:cli && npm run build:web",
+    "build": "npm run build:core && npm run build:web && npm run build:cli",
     "build:core": "npm run build -w packages/core",
     "build:cli": "npm run build -w packages/cli",
     "build:web": "npm run build -w packages/web",

package.json

@@ -1,9 +1,27 @@
 import * as esbuild from 'esbuild';
 import path from 'path';
+import fs from 'fs';
 import { fileURLToPath } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+const workspaceResolve = {
+  name: 'workspace-resolve',
+  setup(build) {
+    build.onResolve({ filter: /^@clux-cli\// }, (args) => {
+      if (args.path === '@clux-cli/core') {
+        return { path: path.resolve(__dirname, '../core/dist/index.js') };
+      }
+      if (
+        args.path === '@clux-cli/web' ||
+        args.path === '@clux-cli/web/dist/server'
+      ) {
+        return { path: path.resolve(__dirname, '../web/dist/server.js') };
+      }
+    });
+  },
+};
+
 await esbuild.build({
   entryPoints: [path.join(__dirname, 'dist/index.js')],
   bundle: true,
@@ -12,9 +30,10 @@ await esbuild.build({
   outfile: path.join(__dirname, 'dist/index.js'),
   allowOverwrite: true,
   external: ['better-sqlite3'],
-  alias: {
-    '@clux-cli/core': path.join(__dirname, '..', 'core', 'dist', 'index.js'),
-    '@clux-cli/web/dist/server': path.join(__dirname, '..', 'web', 'dist', 'server.js'),
-    '@clux-cli/web': path.join(__dirname, '..', 'web', 'dist', 'server.js'),
-  },
+  plugins: [workspaceResolve],
 });
+
+// Copy web public assets into CLI dist so they're available at runtime
+const srcPublic = path.resolve(__dirname, '../web/dist/public');
+const destPublic = path.resolve(__dirname, 'dist/public');
+fs.cpSync(srcPublic, destPublic, { recursive: true });

packages/cli/esbuild.mjs

@@ -1,6 +1,6 @@
 {
   "name": "@clux-cli/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "license": "MIT",
   "main": "dist/index.js",
   "bin": {

packages/cli/package.json

@@ -10,7 +10,6 @@ export function registerWebCommand(program: Command, _manager: TmuxSessionManage
     .action((opts) => {
       process.env.PORT = opts.port;
       process.env.HOST = opts.host;
-      // eslint-disable-next-line @typescript-eslint/no-require-imports
       require('@clux-cli/web/dist/server');
     });
 }

packages/cli/src/commands/web.ts

@@ -1,6 +1,6 @@
 {
   "name": "@clux-cli/core",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": true,
   "license": "MIT",
   "main": "dist/index.js",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clux-cli/web",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": true,
   "license": "MIT",
   "main": "dist/server.js",
@@ -11,7 +11,7 @@
     "directory": "packages/web"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && cp -r public dist/public",
     "dev": "node dist/server.js",
     "watch": "tsc --watch"
   },

packages/web/package.json

@@ -14,7 +14,7 @@ const PORT = parseInt(process.env.PORT || '3456');
 const HOST = process.env.HOST || '127.0.0.1';
 
 app.use(express.json());
-app.use(express.static(path.join(__dirname, '..', 'public')));
+app.use(express.static(path.join(__dirname, 'public')));
 
 app.use(createSessionRoutes(manager));
 app.use(createSettingsRoutes({ host: HOST, port: PORT }));