ugly-app 0.1.422 → 0.1.423

package/dist/cli/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AA0DA,wBAAsB,MAAM,CAAC,IAAI,GAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAqC,GAAG,OAAO,CAAC,IAAI,CAAC,CAoKzH"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AA4DA,wBAAsB,MAAM,CAAC,IAAI,GAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAqC,GAAG,OAAO,CAAC,IAAI,CAAC,CA6MzH"}

package/dist/cli/dev.js

@@ -1,7 +1,9 @@
-import { exec, execSync, spawn } from 'child_process';
+import { exec, execSync } from 'child_process';
 import fs from 'fs';
 import net from 'net';
 import path from 'path';
+import { createRequire } from 'module';
+import concurrently from 'concurrently';
 /**
  * Return the PID of the process listening on `port`, or null if none.
  * Cross-platform; shells out to `lsof` on Unix and `netstat` on Windows.
@@ -127,79 +129,108 @@ export async function runDev(opts = { watch: false, verbose: false }) {
         console.log(`[ugly-app]   NODE_ENV: ${process.env['NODE_ENV']}`);
         console.log(`[ugly-app]   POSTGRES_URL: ${process.env['POSTGRES_URL'] ?? '(default)'}`);
     }
-    return new Promise((resolve, reject) => {
-        const isWin = process.platform === 'win32';
-        const noFail = (cmd) => isWin ? `(${cmd} || (exit /b 0))` : `${cmd} || true`;
-        const binDir = path.join(process.cwd(), 'node_modules', '.bin') + path.sep;
-        const bin = (name) => `"${binDir}${name}"`;
-        const q = (s) => `"${s.replace(/"/g, '\\"')}"`;
-        const serverCmd = opts.watch
-            ? `${bin('tsx')} watch --clear-screen=false --ignore ./client --ignore "**/node_modules/**" server/index.ts`
-            : `${bin('tsx')} server/index.ts`;
-        const hasEsw = fs.existsSync(path.join(binDir, 'esw'));
-        const rawFlag = isWin ? '--raw' : '';
-        const namesFlag = isWin
-            ? ''
-            : hasEsw ? '--names server,tsc,eslint' : '--names server,tsc';
-        const colorsFlag = isWin
-            ? ''
-            : hasEsw ? '--prefix-colors green,yellow,magenta' : '--prefix-colors green,yellow';
-        const cmd = opts.watch
-            ? [
-                bin('concurrently'),
-                namesFlag,
-                colorsFlag,
-                rawFlag,
-                '--kill-others-on-fail',
-                '--handle-input',
-                q(serverCmd),
-                q(noFail(`${bin('tsc')} --watch --noEmit --preserveWatchOutput`)),
-                ...(hasEsw ? [q(noFail(`${bin('esw')} --watch --changed server client shared`))] : []),
-            ].filter(Boolean).join(' ')
-            : [
-                bin('concurrently'),
-                '--names server',
-                '--prefix-colors green',
-                rawFlag,
-                '--kill-others-on-fail',
-                '--handle-input',
-                q(serverCmd),
-            ].filter(Boolean).join(' ');
-        if (verbose) {
-            console.log(`[ugly-app] Spawning: ${cmd}`);
+    const isWin = process.platform === 'win32';
+    const noFail = (cmd) => isWin ? `(${cmd} || (exit /b 0))` : `${cmd} || true`;
+    // Resolve a tool's executable JS entry through the project's
+    // node_modules graph rather than assuming it's hoisted to
+    // `node_modules/.bin/`. Under pnpm-strict, transitive bins (e.g.
+    // `concurrently`, which is a dep of ugly-app and not of the user
+    // project) never land in the top-level `.bin/`, and the old
+    // `node_modules/.bin/<name>` path then exits 127. Resolving the
+    // package's `bin` entry via Node module resolution works for npm,
+    // yarn, pnpm-strict, and pnpm-shamefully-hoist alike, and also
+    // sidesteps Windows shebang issues since we invoke `node <jsfile>`
+    // directly.
+    function resolveBinJs(pkg, binName) {
+        try {
+            const fromCwd = path.join(process.cwd(), 'package.json');
+            const req = createRequire(fromCwd);
+            const pkgJsonPath = req.resolve(`${pkg}/package.json`);
+            const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+            const pkgDir = path.dirname(pkgJsonPath);
+            const binField = pkgJson.bin;
+            if (!binField)
+                return null;
+            const rel = typeof binField === 'string'
+                ? binField
+                : binField[binName ?? pkgJson.name];
+            if (!rel)
+                return null;
+            return path.join(pkgDir, rel);
         }
-        const child = spawn(cmd, [], {
-            stdio: 'inherit',
-            cwd: process.cwd(),
-            shell: true,
-        });
-        // Open browser once the server is listening — opt-in only. Most users
-        // either run ugly-app inside ugly-studio's preview iframe or already
-        // have the tab open from a previous run, so a system browser window
-        // popping open on every restart is intrusive. Set UGLY_APP_OPEN_BROWSER=1
-        // to opt back in.
-        const openBrowser = process.env['UGLY_APP_OPEN_BROWSER'] === '1';
-        if (openBrowser) {
-            const url = `http://localhost:${port}`;
-            waitForPort(parseInt(port, 10)).then(() => {
-                const openCmd = process.platform === 'darwin' ? 'open' :
-                    process.platform === 'win32' ? 'start' : 'xdg-open';
-                exec(`${openCmd} ${url}`);
-            }).catch(() => { });
+        catch {
+            return null;
         }
-        child.on('error', (err) => {
-            if (verbose)
-                console.error('[ugly-app] Spawn error:', err);
-            reject(err);
+    }
+    const tsxBin = resolveBinJs('tsx', 'tsx');
+    const tscBin = resolveBinJs('typescript', 'tsc');
+    const eswBin = resolveBinJs('eslint-watch', 'esw');
+    if (!tsxBin) {
+        throw new Error(`[ugly-app] Could not resolve 'tsx' from ${process.cwd()}. ` +
+            `Run \`npm install\` (or \`pnpm install\`) and try again.`);
+    }
+    const q = (s) => `"${s.replace(/"/g, '\\"')}"`;
+    const node = q(process.execPath);
+    const serverCmd = opts.watch
+        ? `${node} ${q(tsxBin)} watch --clear-screen=false --ignore ./client --ignore "**/node_modules/**" server/index.ts`
+        : `${node} ${q(tsxBin)} server/index.ts`;
+    const hasEsw = eswBin !== null;
+    const hasTsc = tscBin !== null;
+    const commands = [
+        { command: serverCmd, name: 'server', prefixColor: 'green' },
+    ];
+    if (hasTsc) {
+        commands.push({
+            command: noFail(`${node} ${q(tscBin)} --watch --noEmit --preserveWatchOutput`),
+            name: 'tsc',
+            prefixColor: 'yellow',
         });
-        child.on('close', (code) => {
-            if (verbose)
-                console.log(`[ugly-app] Process exited with code ${code}`);
-            if (code !== 0)
-                reject(new Error(`dev process exited with code ${code}`));
-            else
-                resolve();
+    }
+    if (opts.watch && hasEsw) {
+        commands.push({
+            command: noFail(`${node} ${q(eswBin)} --watch --changed server client shared`),
+            name: 'eslint',
+            prefixColor: 'magenta',
         });
+    }
+    // Non-watch mode runs only the server.
+    const finalCommands = opts.watch ? commands : commands.slice(0, 1);
+    if (verbose) {
+        console.log('[ugly-app] Spawning:');
+        for (const c of finalCommands) {
+            console.log(`  [${c.name}] ${c.command}`);
+        }
+    }
+    const { result } = concurrently(finalCommands, {
+        killOthers: ['failure'],
+        handleInput: true,
+        raw: !isWin,
     });
+    // Open browser once the server is listening — opt-in only. Most users
+    // either run ugly-app inside ugly-studio's preview iframe or already
+    // have the tab open from a previous run, so a system browser window
+    // popping open on every restart is intrusive. Set UGLY_APP_OPEN_BROWSER=1
+    // to opt back in.
+    const openBrowser = process.env['UGLY_APP_OPEN_BROWSER'] === '1';
+    if (openBrowser) {
+        const url = `http://localhost:${port}`;
+        waitForPort(parseInt(port, 10)).then(() => {
+            const openCmd = process.platform === 'darwin' ? 'open' :
+                process.platform === 'win32' ? 'start' : 'xdg-open';
+            exec(`${openCmd} ${url}`);
+        }).catch(() => { });
+    }
+    try {
+        await result;
+    }
+    catch (err) {
+        // concurrently rejects with an array of CloseEvent on non-zero exits.
+        if (Array.isArray(err)) {
+            const failed = err.find((e) => e.exitCode !== 0);
+            const code = failed?.exitCode ?? 1;
+            throw new Error(`dev process exited with code ${code}`);
+        }
+        throw err;
+    }
 }
 //# sourceMappingURL=dev.js.map

package/dist/cli/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"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"}

package/dist/cli/version.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_VERSION = "0.1.422";
+export declare const CLI_VERSION = "0.1.423";
 //# sourceMappingURL=version.d.ts.map

package/dist/cli/version.js

@@ -1,3 +1,3 @@
 // Auto-generated by prebuild — do not edit manually
-export const CLI_VERSION = "0.1.422";
+export const CLI_VERSION = "0.1.423";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ugly-app",
-  "version": "0.1.422",
+  "version": "0.1.423",
   "type": "module",
   "main": "./dist/server/index.js",
   "exports": {

package/src/cli/dev.ts

@@ -1,7 +1,9 @@
-import { exec, execSync, spawn } from 'child_process';
+import { exec, execSync } from 'child_process';
 import fs from 'fs';
 import net from 'net';
 import path from 'path';
+import { createRequire } from 'module';
+import concurrently from 'concurrently';
 /**
  * Return the PID of the process listening on `port`, or null if none.
  * Cross-platform; shells out to `lsof` on Unix and `netstat` on Windows.
@@ -139,85 +141,126 @@ export async function runDev(opts: { watch: boolean; verbose: boolean } = { watc
     console.log(`[ugly-app]   POSTGRES_URL: ${process.env['POSTGRES_URL'] ?? '(default)'}`);
   }
 
-  return new Promise<void>((resolve, reject) => {
-    const isWin = process.platform === 'win32';
-    const noFail = (cmd: string) =>
-      isWin ? `(${cmd} || (exit /b 0))` : `${cmd} || true`;
-
-    const binDir = path.join(process.cwd(), 'node_modules', '.bin') + path.sep;
-    const bin = (name: string) => `"${binDir}${name}"`;
-    const q = (s: string) => `"${s.replace(/"/g, '\\"')}"`;
-
-    const serverCmd = opts.watch
-      ? `${bin('tsx')} watch --clear-screen=false --ignore ./client --ignore "**/node_modules/**" server/index.ts`
-      : `${bin('tsx')} server/index.ts`;
-
-    const hasEsw = fs.existsSync(path.join(binDir, 'esw'));
-
-    const rawFlag = isWin ? '--raw' : '';
-    const namesFlag = isWin
-      ? ''
-      : hasEsw ? '--names server,tsc,eslint' : '--names server,tsc';
-    const colorsFlag = isWin
-      ? ''
-      : hasEsw ? '--prefix-colors green,yellow,magenta' : '--prefix-colors green,yellow';
-
-    const cmd = opts.watch
-      ? [
-          bin('concurrently'),
-          namesFlag,
-          colorsFlag,
-          rawFlag,
-          '--kill-others-on-fail',
-          '--handle-input',
-          q(serverCmd),
-          q(noFail(`${bin('tsc')} --watch --noEmit --preserveWatchOutput`)),
-          ...(hasEsw ? [q(noFail(`${bin('esw')} --watch --changed server client shared`))] : []),
-        ].filter(Boolean).join(' ')
-      : [
-          bin('concurrently'),
-          '--names server',
-          '--prefix-colors green',
-          rawFlag,
-          '--kill-others-on-fail',
-          '--handle-input',
-          q(serverCmd),
-        ].filter(Boolean).join(' ');
-
-    if (verbose) {
-      console.log(`[ugly-app] Spawning: ${cmd}`);
+  const isWin = process.platform === 'win32';
+  const noFail = (cmd: string) =>
+    isWin ? `(${cmd} || (exit /b 0))` : `${cmd} || true`;
+
+  // Resolve a tool's executable JS entry through the project's
+  // node_modules graph rather than assuming it's hoisted to
+  // `node_modules/.bin/`. Under pnpm-strict, transitive bins (e.g.
+  // `concurrently`, which is a dep of ugly-app and not of the user
+  // project) never land in the top-level `.bin/`, and the old
+  // `node_modules/.bin/<name>` path then exits 127. Resolving the
+  // package's `bin` entry via Node module resolution works for npm,
+  // yarn, pnpm-strict, and pnpm-shamefully-hoist alike, and also
+  // sidesteps Windows shebang issues since we invoke `node <jsfile>`
+  // directly.
+  function resolveBinJs(pkg: string, binName?: string): string | null {
+    try {
+      const fromCwd = path.join(process.cwd(), 'package.json');
+      const req = createRequire(fromCwd);
+      const pkgJsonPath = req.resolve(`${pkg}/package.json`);
+      const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8')) as {
+        name: string;
+        bin?: string | Record<string, string>;
+      };
+      const pkgDir = path.dirname(pkgJsonPath);
+      const binField = pkgJson.bin;
+      if (!binField) return null;
+      const rel =
+        typeof binField === 'string'
+          ? binField
+          : binField[binName ?? pkgJson.name];
+      if (!rel) return null;
+      return path.join(pkgDir, rel);
+    } catch {
+      return null;
     }
+  }
 
-    const child = spawn(cmd, [], {
-      stdio: 'inherit',
-      cwd: process.cwd(),
-      shell: true,
-    });
+  const tsxBin = resolveBinJs('tsx', 'tsx');
+  const tscBin = resolveBinJs('typescript', 'tsc');
+  const eswBin = resolveBinJs('eslint-watch', 'esw');
 
-    // Open browser once the server is listening — opt-in only. Most users
-    // either run ugly-app inside ugly-studio's preview iframe or already
-    // have the tab open from a previous run, so a system browser window
-    // popping open on every restart is intrusive. Set UGLY_APP_OPEN_BROWSER=1
-    // to opt back in.
-    const openBrowser = process.env['UGLY_APP_OPEN_BROWSER'] === '1';
-    if (openBrowser) {
-      const url = `http://localhost:${port}`;
-      waitForPort(parseInt(port, 10)).then(() => {
-        const openCmd =
-          process.platform === 'darwin' ? 'open' :
-          process.platform === 'win32' ? 'start' : 'xdg-open';
-        exec(`${openCmd} ${url}`);
-      }).catch(() => { /* best effort */ });
-    }
+  if (!tsxBin) {
+    throw new Error(
+      `[ugly-app] Could not resolve 'tsx' from ${process.cwd()}. ` +
+        `Run \`npm install\` (or \`pnpm install\`) and try again.`,
+    );
+  }
 
-    child.on('error', (err) => {
-      if (verbose) console.error('[ugly-app] Spawn error:', err);
-      reject(err);
+  const q = (s: string) => `"${s.replace(/"/g, '\\"')}"`;
+  const node = q(process.execPath);
+
+  const serverCmd = opts.watch
+    ? `${node} ${q(tsxBin)} watch --clear-screen=false --ignore ./client --ignore "**/node_modules/**" server/index.ts`
+    : `${node} ${q(tsxBin)} server/index.ts`;
+
+  const hasEsw = eswBin !== null;
+  const hasTsc = tscBin !== null;
+
+  const commands: { command: string; name: string; prefixColor: string }[] = [
+    { command: serverCmd, name: 'server', prefixColor: 'green' },
+  ];
+  if (hasTsc) {
+    commands.push({
+      command: noFail(
+        `${node} ${q(tscBin!)} --watch --noEmit --preserveWatchOutput`,
+      ),
+      name: 'tsc',
+      prefixColor: 'yellow',
     });
-    child.on('close', (code) => {
-      if (verbose) console.log(`[ugly-app] Process exited with code ${code}`);
-      if (code !== 0) reject(new Error(`dev process exited with code ${code}`));
-      else resolve();
+  }
+  if (opts.watch && hasEsw) {
+    commands.push({
+      command: noFail(
+        `${node} ${q(eswBin!)} --watch --changed server client shared`,
+      ),
+      name: 'eslint',
+      prefixColor: 'magenta',
     });
+  }
+  // Non-watch mode runs only the server.
+  const finalCommands = opts.watch ? commands : commands.slice(0, 1);
+
+  if (verbose) {
+    console.log('[ugly-app] Spawning:');
+    for (const c of finalCommands) {
+      console.log(`  [${c.name}] ${c.command}`);
+    }
+  }
+
+  const { result } = concurrently(finalCommands, {
+    killOthers: ['failure'],
+    handleInput: true,
+    raw: !isWin,
   });
+
+  // Open browser once the server is listening — opt-in only. Most users
+  // either run ugly-app inside ugly-studio's preview iframe or already
+  // have the tab open from a previous run, so a system browser window
+  // popping open on every restart is intrusive. Set UGLY_APP_OPEN_BROWSER=1
+  // to opt back in.
+  const openBrowser = process.env['UGLY_APP_OPEN_BROWSER'] === '1';
+  if (openBrowser) {
+    const url = `http://localhost:${port}`;
+    waitForPort(parseInt(port, 10)).then(() => {
+      const openCmd =
+        process.platform === 'darwin' ? 'open' :
+        process.platform === 'win32' ? 'start' : 'xdg-open';
+      exec(`${openCmd} ${url}`);
+    }).catch(() => { /* best effort */ });
+  }
+
+  try {
+    await result;
+  } catch (err) {
+    // concurrently rejects with an array of CloseEvent on non-zero exits.
+    if (Array.isArray(err)) {
+      const failed = err.find((e: { exitCode: number | string }) => e.exitCode !== 0);
+      const code = failed?.exitCode ?? 1;
+      throw new Error(`dev process exited with code ${code}`);
+    }
+    throw err;
+  }
 }

package/src/cli/version.ts

@@ -1,2 +1,2 @@
 // Auto-generated by prebuild — do not edit manually
-export const CLI_VERSION = "0.1.422";
+export const CLI_VERSION = "0.1.423";