@mintlify/cli 4.0.1142 → 4.0.1144

package/__test__/helpers.test.ts

@@ -15,16 +15,15 @@ describe('getCliVersion', () => {
 
   it('returns a test marker when CLI_TEST_MODE is enabled', () => {
     process.env.CLI_TEST_MODE = 'true';
-    expect(getCliVersion()).toBe('test-cli');
+    expect(getCliVersion('mint')).toBe('test-cli');
   });
 
   it(
     'returns LOCAL_LINKED_CLI_VERSION when running from the monorepo source ' +
       '(not inside node_modules)',
     () => {
-      // Source lives outside node_modules, mirroring `npm link` / `yarn dev`. See #7121.
       delete process.env.CLI_TEST_MODE;
-      expect(getCliVersion()).toBe(LOCAL_LINKED_CLI_VERSION);
+      expect(getCliVersion('mint')).toBe(LOCAL_LINKED_CLI_VERSION);
     }
   );
 });

package/__test__/update.test.ts

@@ -8,8 +8,9 @@ vi.mock('@mintlify/previewing', async () => {
     await vi.importActual<typeof import('@mintlify/previewing')>('@mintlify/previewing');
   return {
     ...originalModule,
-    getClientVersion: vi.fn(),
-    downloadTargetMint: vi.fn(),
+    getClientVersion: vi.fn().mockReturnValue('1.0.0'),
+    getLatestClientVersion: vi.fn().mockResolvedValue('2.0.0'),
+    downloadTargetMint: vi.fn().mockResolvedValue(undefined),
   };
 });
 
@@ -50,19 +51,16 @@ describe('update', () => {
 
     await update({ packageName: 'mintlify' });
 
-    expect(addLogSpy).toHaveBeenCalledTimes(3);
-    expect(addLogSpy).toHaveBeenCalledWith(
-      expect.objectContaining({ props: { message: 'updating...' } })
-    );
-    expect(addLogSpy).toHaveBeenCalledWith(
-      expect.objectContaining({ props: { message: 'updating mintlify package...' } })
-    );
+    expect(execAsync).toHaveBeenCalledWith('npm install -g mintlify@latest --silent');
+    expect(previewing.downloadTargetMint).toHaveBeenCalledWith({
+      targetVersion: '2.0.0',
+      existingVersion: '1.0.0',
+    });
     expect(addLogSpy).toHaveBeenCalledWith(
       expect.objectContaining({
         props: { message: 'updated mintlify to the latest version: 2.0.0' },
       })
     );
-    expect(execAsync).toHaveBeenCalledWith('npm install -g mintlify@latest --silent');
   });
 
   it('should return when already up to date', async () => {
@@ -71,18 +69,16 @@ describe('update', () => {
       client: '1.0.0',
     });
     vi.mocked(getLatestCliVersion).mockReturnValue('1.0.0');
-    vi.mocked(execAsync).mockResolvedValue({ stdout: '', stderr: '' });
+    vi.mocked(previewing.getLatestClientVersion).mockResolvedValue('1.0.0');
+    vi.mocked(previewing.getClientVersion).mockReturnValue('1.0.0');
 
     await update({ packageName: 'mintlify' });
 
-    expect(addLogSpy).toHaveBeenCalledTimes(2);
-    expect(addLogSpy).toHaveBeenCalledWith(
-      expect.objectContaining({ props: { message: 'updating...' } })
-    );
+    expect(execAsync).not.toHaveBeenCalled();
+    expect(previewing.downloadTargetMint).not.toHaveBeenCalled();
     expect(addLogSpy).toHaveBeenCalledWith(
       expect.objectContaining({ props: { message: 'already up to date' } })
     );
-    expect(execAsync).not.toHaveBeenCalled();
   });
 
   it('should handle cli update failure', async () => {

package/bin/cli.js

@@ -92,7 +92,7 @@ export const cli = ({ packageName = 'mint' }) => {
         var _a;
         yield autoUpgradeIfNeeded();
         const port = yield checkPort(argv);
-        const { cli: cliVersion } = getVersions();
+        const { cli: cliVersion } = getVersions(packageName);
         let accessToken;
         let subdomain;
         try {
@@ -150,7 +150,7 @@ export const cli = ({ packageName = 'mint' }) => {
                 return;
             }
         }
-        const { cli: cliVersion } = getVersions();
+        const { cli: cliVersion } = getVersions(packageName);
         yield validateBuild(Object.assign(Object.assign({}, argv), { packageName,
             cliVersion }));
     }))
@@ -176,7 +176,7 @@ export const cli = ({ packageName = 'mint' }) => {
         .usage('usage: mintlify export [options]')
         .example('mintlify export', 'export as export.zip')
         .example('mintlify export --output docs.zip', 'export to custom filename'), (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        const { cli: cliVersion } = getVersions();
+        const { cli: cliVersion } = getVersions(packageName);
         yield exportSite(Object.assign(Object.assign({}, argv), { packageName,
             cliVersion }));
         yield terminate(0);
@@ -386,7 +386,7 @@ export const cli = ({ packageName = 'mint' }) => {
         yield terminate(accessibilityCheckTerminateCode || mdxLinterTerminateCode);
     }))
         .command(['version', 'v'], 'Display the current version of the CLI and client', () => undefined, () => __awaiter(void 0, void 0, void 0, function* () {
-        const { cli, client } = getVersions();
+        const { cli, client } = getVersions(packageName);
         addLog(_jsxs(Text, { children: [_jsx(Text, { bold: true, color: "green", children: "cli version" }), ' ', cli] }));
         addLog(_jsxs(Text, { children: [_jsx(Text, { bold: true, color: "green", children: "client version" }), ' ', client] }));
     }))

package/bin/helpers.js

@@ -19,6 +19,7 @@ import yaml from 'js-yaml';
 import { exec, execSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
+import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import { promisify } from 'node:util';
 import path from 'path';
@@ -110,44 +111,41 @@ export const upgradeConfig = () => __awaiter(void 0, void 0, void 0, function* (
         addLog(_jsx(ErrorLog, { message: err instanceof Error ? err.message : 'an unknown error occurred' }));
     }
 });
-// Resolve the CLI's own package.json via `import.meta.url` so the version is
-// always the one shipped with this package, regardless of cwd. See #7121.
-const CLI_PACKAGE_JSON_PATH = (() => {
+const require = createRequire(import.meta.url);
+const isRunningFromLinkedBuild = () => {
     try {
-        return fileURLToPath(new URL('../package.json', import.meta.url));
+        const thisFile = fileURLToPath(import.meta.url);
+        return !thisFile.split(path.sep).includes('node_modules');
     }
     catch (_a) {
-        return undefined;
+        return false;
     }
-})();
-const readCliPackageVersion = () => {
-    if (!CLI_PACKAGE_JSON_PATH)
-        return undefined;
+};
+const readPackageVersion = (packageName) => {
     try {
-        const pkg = JSON.parse(readFileSync(CLI_PACKAGE_JSON_PATH, 'utf8'));
+        const pkgPath = require.resolve(`${packageName}/package.json`);
+        const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
         return typeof pkg.version === 'string' ? pkg.version : undefined;
     }
     catch (_a) {
         return undefined;
     }
 };
-// Outside `node_modules` means `yarn dev` or `npm link`: treat as linked. See #7121.
-const isRunningFromLinkedBuild = () => {
-    if (!CLI_PACKAGE_JSON_PATH)
-        return false;
-    return !CLI_PACKAGE_JSON_PATH.split(path.sep).includes('node_modules');
-};
-export const getCliVersion = () => {
+export const getCliVersion = (packageName) => {
+    var _a;
+    if (packageName === void 0) { packageName = (_a = process.env.MINTLIFY_PACKAGE_NAME) !== null && _a !== void 0 ? _a : 'mint'; }
     if (process.env.CLI_TEST_MODE === 'true') {
         return 'test-cli';
     }
     if (isRunningFromLinkedBuild()) {
         return LOCAL_LINKED_CLI_VERSION;
     }
-    return readCliPackageVersion();
+    return readPackageVersion(packageName);
 };
-export const getVersions = () => {
-    const cli = getCliVersion();
+export const getVersions = (packageName) => {
+    var _a;
+    if (packageName === void 0) { packageName = (_a = process.env.MINTLIFY_PACKAGE_NAME) !== null && _a !== void 0 ? _a : 'mint'; }
+    const cli = getCliVersion(packageName);
     const client = getClientVersion().trim();
     return { cli, client };
 };