@mintlify/cli 4.0.627 → 4.0.629

package/bin/update.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { getTargetMintVersion, downloadTargetMint, SpinnerLog, SuccessLog, ErrorLog, addLog, clearLogs, } from '@mintlify/previewing';
-import { execAsync, getLatestCliVersion, getVersions } from './helpers.js';
+import { execAsync, getLatestCliVersion, getVersions, detectPackageManager } from './helpers.js';
 export const update = (_a) => __awaiter(void 0, [_a], void 0, function* ({ packageName, silent, }) {
     if (!silent) {
         addLog(_jsx(SpinnerLog, { message: "updating..." }));
@@ -35,10 +35,17 @@ export const update = (_a) => __awaiter(void 0, [_a], void 0, function* ({ packa
                 clearLogs();
                 addLog(_jsx(SpinnerLog, { message: `updating ${packageName} package...` }));
             }
-            yield execAsync(`npm install -g ${packageName}@latest --silent`);
+            const packageManager = yield detectPackageManager({ packageName });
+            if (packageManager === 'pnpm') {
+                yield execAsync(`pnpm install -g ${packageName}@latest --silent`);
+            }
+            else {
+                yield execAsync(`npm install -g ${packageName}@latest --silent`);
+            }
         }
         catch (err) {
             if (!silent) {
+                clearLogs();
                 addLog(_jsx(ErrorLog, { message: `failed to update ${packageName}@latest` }));
             }
             return;
@@ -56,6 +63,7 @@ export const update = (_a) => __awaiter(void 0, [_a], void 0, function* ({ packa
         }
         catch (err) {
             if (!silent) {
+                clearLogs();
                 addLog(_jsx(ErrorLog, { message: `failed to update mintlify client to ${latestClientVersion}` }));
             }
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintlify/cli",
-  "version": "4.0.627",
+  "version": "4.0.629",
   "description": "The Mintlify CLI",
   "engines": {
     "node": ">=18.0.0"
@@ -73,5 +73,5 @@
     "vitest": "^2.0.4",
     "vitest-mock-process": "^1.0.4"
   },
-  "gitHead": "04c0129b6fb7fcd56c65fd4efe3be1dba4594f72"
+  "gitHead": "1f5d91b3cda50efafeb9c460d8ce09b0f531ffbe"
 }

package/src/cli.tsx

@@ -32,11 +32,12 @@ import {
 } from './helpers.js';
 import { update } from './update.js';
 
-export const cli = () => {
+export const cli = ({ packageName = 'mint' }: { packageName?: string }) => {
   render(<Logs />);
 
   return (
     yargs(hideBin(process.argv))
+      .scriptName(packageName)
       .middleware(checkNodeVersion)
       .middleware(suppressConsoleWarnings)
       .command(
@@ -71,7 +72,6 @@ export const cli = () => {
             .example('mintlify dev --no-open', 'run without opening in browser'),
         async (argv) => {
           const port = await checkPort(argv);
-          const packageName = process.argv[1]?.split('/').pop() ?? 'mintlify';
           const cliVersion = getCliVersion();
           if (
             cliVersion &&
@@ -222,7 +222,6 @@ export const cli = () => {
         'update the CLI to the latest version',
         () => undefined,
         async () => {
-          const packageName = process.argv[1]?.split('/').pop() ?? 'mintlify';
           await update({ packageName });
           await terminate(0);
         }

package/src/helpers.tsx

@@ -174,3 +174,16 @@ export const terminate = async (code: number) => {
 };
 
 export const execAsync = promisify(exec);
+
+export const detectPackageManager = async ({ packageName }: { packageName: string }) => {
+  try {
+    const { stdout: packagePath } = await execAsync(`which ${packageName}`);
+    if (packagePath.includes('pnpm')) {
+      return 'pnpm';
+    } else {
+      return 'npm';
+    }
+  } catch (error) {
+    return 'npm';
+  }
+};

package/src/index.ts

@@ -1,5 +1,109 @@
 #!/usr/bin/env node
-import { cli } from './cli.js';
+import { spawn, type ChildProcess } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const packageName =
+  process.argv[1]?.split('/').pop() === 'index.js'
+    ? 'mint'
+    : process.argv[1]?.split('/').pop() ?? 'mint';
+
+let cli: ChildProcess | null = null;
+let isShuttingDown = false;
+let hasExited = false;
+
+const cleanup = async (): Promise<void> => {
+  if (isShuttingDown) return;
+  isShuttingDown = true;
+
+  if (cli && !cli.killed) {
+    try {
+      cli.kill('SIGTERM');
+
+      await new Promise<void>((resolve) => {
+        const timeout = setTimeout(() => {
+          if (cli && !cli.killed) {
+            cli.kill('SIGKILL');
+          }
+          resolve();
+        }, 5000);
+
+        cli!.once('exit', () => {
+          clearTimeout(timeout);
+          resolve();
+        });
+      });
+    } catch (error) {
+      // ignore
+    }
+  }
+};
+
+const exitProcess = (code: number) => {
+  if (hasExited) return;
+  hasExited = true;
+  process.exit(code);
+};
+
+const killSignals = ['SIGINT', 'SIGTERM', 'SIGQUIT', 'SIGHUP'];
+killSignals.forEach((signal) => {
+  process.on(signal, async () => {
+    await cleanup();
+    exitProcess(0);
+  });
+});
+
+process.on('uncaughtException', async () => {
+  await cleanup();
+  exitProcess(1);
+});
+
+process.on('unhandledRejection', async () => {
+  await cleanup();
+  exitProcess(1);
+});
+
+try {
+  cli = spawn(
+    'node',
+    ['--no-deprecation', path.join(__dirname, '../bin/start.js'), ...process.argv.slice(2)],
+    {
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        MINTLIFY_PACKAGE_NAME: packageName,
+      },
+      shell: process.platform === 'win32',
+      windowsHide: process.platform === 'win32',
+      detached: false,
+    }
+  );
+
+  cli.on('error', async (error) => {
+    console.error(`Failed to start ${packageName}: ${error.message}`);
+    await cleanup();
+    exitProcess(1);
+  });
+
+  cli.on('exit', (code) => {
+    exitProcess(code ?? 0);
+  });
+} catch (error) {
+  console.error(`Failed to start ${packageName}: ${error}`);
+  exitProcess(1);
+}
+
+process.on('exit', () => {
+  if (cli && !cli.killed) {
+    try {
+      cli.kill('SIGKILL');
+    } catch (error) {
+      // ignore
+    }
+  }
+});
 
 export { cli };
-void cli();

package/src/start.ts

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { cli } from './cli.js';
+
+const packageName = process.env.MINTLIFY_PACKAGE_NAME ?? 'mint';
+
+void cli({ packageName });

package/src/update.tsx

@@ -8,7 +8,7 @@ import {
   clearLogs,
 } from '@mintlify/previewing';
 
-import { execAsync, getLatestCliVersion, getVersions } from './helpers.js';
+import { execAsync, getLatestCliVersion, getVersions, detectPackageManager } from './helpers.js';
 
 export const update = async ({
   packageName,
@@ -44,9 +44,15 @@ export const update = async ({
         clearLogs();
         addLog(<SpinnerLog message={`updating ${packageName} package...`} />);
       }
-      await execAsync(`npm install -g ${packageName}@latest --silent`);
+      const packageManager = await detectPackageManager({ packageName });
+      if (packageManager === 'pnpm') {
+        await execAsync(`pnpm install -g ${packageName}@latest --silent`);
+      } else {
+        await execAsync(`npm install -g ${packageName}@latest --silent`);
+      }
     } catch (err) {
       if (!silent) {
+        clearLogs();
         addLog(<ErrorLog message={`failed to update ${packageName}@latest`} />);
       }
       return;
@@ -64,6 +70,7 @@ export const update = async ({
       });
     } catch (err) {
       if (!silent) {
+        clearLogs();
         addLog(<ErrorLog message={`failed to update mintlify client to ${latestClientVersion}`} />);
       }
       return;