Skip to content

Remove resolvePm2 and fix pm2 types #2174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+715 −84
Open

Remove resolvePm2 and fix pm2 types #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 2 additions & 36 deletions cli/lib/pm2-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import fs from 'fs';
import os from 'os';
import path from 'path';
import { cacheFunctionTTL } from 'common/lib/cache-function-ttl';
import { StartOptions } from 'pm2';
import { custom as PM2, StartOptions } from 'pm2';
import { getAppdataPath } from 'cli/lib/appdata';
import { ProcessDescription } from 'cli/lib/types/pm2';
import { ManagerMessage } from './types/wordpress-server-ipc';
Expand All @@ -15,40 +14,7 @@ const DAEMON_TIMEOUT = 10000;
// This ensures all Studio CLI commands use the same PM2 daemon
const STUDIO_PM2_HOME = path.join( os.homedir(), '.studio', 'pm2' );

process.env.PM2_HOME = STUDIO_PM2_HOME;

function resolvePm2(): typeof import('pm2') {
try {
return require( 'pm2' );
} catch ( error ) {
const possiblePaths: string[] = [
path.join( __dirname, 'node_modules', 'pm2' ),
path.join( path.dirname( __dirname ), 'node_modules', 'pm2' ),
path.join( __dirname, '..', 'node_modules', 'pm2' ),
path.join( __dirname, '..', '..', 'node_modules', 'pm2' ),
path.join( __dirname, '..', '..', '..', 'node_modules', 'pm2' ),
path.resolve( process.cwd(), 'node_modules', 'pm2' ),
];

for ( const pm2Path of possiblePaths ) {
if ( fs.existsSync( pm2Path ) ) {
try {
return require( pm2Path );
} catch {
continue;
}
}
}

throw new Error(
`pm2 module not found. Please ensure pm2 is installed in the CLI dependencies. Tried paths: ${ possiblePaths.join(
', '
) }`
);
}
}

const pm2 = resolvePm2();
const pm2 = new PM2( { pm2_home: STUDIO_PM2_HOME } );

let isConnected = false;

Expand Down
Loading