@automattic/jetpack-cli 0.1.0-beta3 → 1.0.0-beta1

package/bin/jp.js

@@ -8,11 +8,26 @@ import { fileURLToPath } from 'url';
 import chalk from 'chalk';
 import dotenv from 'dotenv';
 import prompts from 'prompts';
+import updateNotifier from 'update-notifier';
 
 // Get package.json path relative to this file
 const __dirname = dirname( fileURLToPath( import.meta.url ) );
 const packageJson = JSON.parse( readFileSync( resolve( __dirname, '../package.json' ), 'utf8' ) );
 
+// Check for updates
+const notifier = updateNotifier( {
+	pkg: packageJson,
+	updateCheckInterval: 1000 * 60 * 60 * 24, // Check once per day
+} );
+
+// Show update notification
+notifier.notify( {
+	message:
+		'Update available for Jetpack CLI: {currentVersion} → {latestVersion}\n' +
+		'Run {updateCommand} to update',
+	isGlobal: true,
+} );
+
 /**
  * Check if a directory is the monorepo root.
  *
@@ -35,10 +50,13 @@ const isMonorepoRoot = dir => {
  */
 const findMonorepoRoot = startDir => {
 	let dir = startDir;
-	while ( dir !== '/' ) {
+	let prevDir;
+	while ( dir !== prevDir ) {
+		// Keep going until dirname() stops changing the path
 		if ( isMonorepoRoot( dir ) ) {
 			return dir;
 		}
+		prevDir = dir;
 		dir = dirname( dir );
 	}
 	return null;
@@ -154,31 +172,6 @@ const main = async () => {
 					// Create empty .env file
 					fs.writeFileSync( resolve( monorepoRoot, 'tools/docker/.env' ), '' );
 
-					const images = [
-						{ name: 'mariadb:lts' },
-						{ name: 'automattic/jetpack-wordpress-dev:latest' },
-						{ name: 'phpmyadmin/phpmyadmin:latest', platform: 'linux/amd64' },
-						{ name: 'maildev/maildev', platform: 'linux/amd64' },
-						{ name: 'atmoz/sftp', platform: 'linux/amd64' },
-					];
-
-					for ( const image of images ) {
-						const inspect = spawnSync( 'docker', [ 'image', 'inspect', image.name ], {
-							stdio: 'ignore',
-						} );
-						if ( inspect.status !== 0 ) {
-							console.log( chalk.blue( `Pulling ${ image.name }...` ) );
-							const pullArgs = [ 'pull', image.name ];
-							if ( image.platform ) {
-								pullArgs.splice( 1, 0, '--platform', image.platform );
-							}
-							const pull = spawnSync( 'docker', pullArgs, { stdio: 'inherit' } );
-							if ( pull.status !== 0 ) {
-								throw new Error( `Failed to pull ${ image.name }` );
-							}
-						}
-					}
-
 					const configResult = spawnSync(
 						resolve( monorepoRoot, 'tools/docker/bin/monorepo' ),
 						[ 'pnpm', 'jetpack', 'docker', 'config' ],
@@ -225,48 +218,81 @@ const main = async () => {
 				// Get project name (from docker.js)
 				const projectName = args.includes( '--type=e2e' ) ? 'jetpack_e2e' : 'jetpack_dev';
 
-				// Load versions from .github/versions.sh
-				const versionsPath = resolve( monorepoRoot, '.github/versions.sh' );
-				const versions = fs.readFileSync( versionsPath, 'utf8' );
-				const versionVars = {};
-				versions.split( '\n' ).forEach( line => {
-					const match = line.match( /^([A-Z_]+)=(.+)$/ );
-					if ( match ) {
-						versionVars[ match[ 1 ] ] = match[ 2 ].replace( /['"]/g, '' );
-					}
-				} );
-
 				// Build environment variables (from docker.js)
 				const envVars = {
-					...process.env,
-					// Load from default.env
-					...( fs.existsSync( resolve( monorepoRoot, 'tools/docker/default.env' ) )
-						? dotenv.parse( fs.readFileSync( resolve( monorepoRoot, 'tools/docker/default.env' ) ) )
-						: {} ),
-					// Load from .env if it exists
-					...( fs.existsSync( resolve( monorepoRoot, 'tools/docker/.env' ) )
-						? dotenv.parse( fs.readFileSync( resolve( monorepoRoot, 'tools/docker/.env' ) ) )
-						: {} ),
-					HOST_CWD: monorepoRoot,
-					PHP_VERSION: versionVars.PHP_VERSION,
-					COMPOSER_VERSION: versionVars.COMPOSER_VERSION,
-					NODE_VERSION: versionVars.NODE_VERSION,
-					PNPM_VERSION: versionVars.PNPM_VERSION,
-					COMPOSE_PROJECT_NAME: projectName,
-					PORT_WORDPRESS: args.includes( '--type=e2e' ) ? '8889' : '80',
+					...process.env, // Start with process.env
 				};
 
+				// Add default env vars if they exist
+				if ( fs.existsSync( resolve( monorepoRoot, 'tools/docker/default.env' ) ) ) {
+					Object.assign(
+						envVars,
+						dotenv.parse( fs.readFileSync( resolve( monorepoRoot, 'tools/docker/default.env' ) ) )
+					);
+				}
+
+				// Add user overrides from .env if they exist
+				if ( fs.existsSync( resolve( monorepoRoot, 'tools/docker/.env' ) ) ) {
+					Object.assign(
+						envVars,
+						dotenv.parse( fs.readFileSync( resolve( monorepoRoot, 'tools/docker/.env' ) ) )
+					);
+				}
+
+				// Only set these specific vars if they're not already set in .env
+				if ( ! envVars.COMPOSE_PROJECT_NAME ) {
+					envVars.COMPOSE_PROJECT_NAME = projectName;
+				}
+				if ( ! envVars.PORT_WORDPRESS ) {
+					envVars.PORT_WORDPRESS = args.includes( '--type=e2e' ) ? '8889' : '80';
+				}
+
+				// Load versions from .github/versions.sh if not already set
+				if (
+					! (
+						envVars.PHP_VERSION &&
+						envVars.COMPOSER_VERSION &&
+						envVars.NODE_VERSION &&
+						envVars.PNPM_VERSION
+					)
+				) {
+					const versionsPath = resolve( monorepoRoot, '.github/versions.sh' );
+					const versions = fs.readFileSync( versionsPath, 'utf8' );
+					const versionVars = {};
+					versions.split( '\n' ).forEach( line => {
+						const match = line.match( /^([A-Z_]+)=(.+)$/ );
+						if ( match ) {
+							versionVars[ match[ 1 ] ] = match[ 2 ].replace( /['"]/g, '' );
+						}
+					} );
+
+					// Only set version vars if they're not already set
+					if ( ! envVars.PHP_VERSION ) envVars.PHP_VERSION = versionVars.PHP_VERSION;
+					if ( ! envVars.COMPOSER_VERSION ) envVars.COMPOSER_VERSION = versionVars.COMPOSER_VERSION;
+					if ( ! envVars.NODE_VERSION ) envVars.NODE_VERSION = versionVars.NODE_VERSION;
+					if ( ! envVars.PNPM_VERSION ) envVars.PNPM_VERSION = versionVars.PNPM_VERSION;
+				}
+
+				// Always set HOST_CWD as it's required for Docker context
+				envVars.HOST_CWD = monorepoRoot;
+
 				// Build the list of compose files to use
-				const composeFiles = [
-					'-f',
-					resolve( monorepoRoot, 'tools/docker/docker-compose.yml' ),
-					'-f',
-					resolve( monorepoRoot, 'tools/docker/compose-mappings.built.yml' ),
-					'-f',
-					resolve( monorepoRoot, 'tools/docker/compose-extras.built.yml' ),
-				];
-
-				const result = spawnSync( 'docker', [ 'compose', ...composeFiles, ...args.slice( 1 ) ], {
+				const composeFiles =
+					args[ 0 ] === 'docker' && [ 'build-image', 'install' ].includes( args[ 1 ] )
+						? [ '-f', resolve( monorepoRoot, 'tools/docker/docker-compose-monorepo.yml' ) ]
+						: [
+								'-f',
+								resolve( monorepoRoot, 'tools/docker/docker-compose.yml' ),
+								'-f',
+								resolve( monorepoRoot, 'tools/docker/compose-mappings.built.yml' ),
+								'-f',
+								resolve( monorepoRoot, 'tools/docker/compose-extras.built.yml' ),
+						  ];
+
+				// Add dev profile for monorepo service
+				const composeArgs = [ 'compose', '--profile', 'dev', ...composeFiles, ...args.slice( 1 ) ];
+
+				const result = spawnSync( 'docker', composeArgs, {
 					stdio: 'inherit',
 					shell: true,
 					cwd: resolve( monorepoRoot, 'tools/docker' ),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-cli",
-	"version": "0.1.0-beta3",
+	"version": "1.0.0-beta1",
 	"description": "Docker-based CLI for Jetpack development",
 	"bin": {
 		"jp": "bin/jp.js"
@@ -12,7 +12,8 @@
 	"dependencies": {
 		"chalk": "^5.4.1",
 		"dotenv": "^16.3.1",
-		"prompts": "^2.4.2"
+		"prompts": "^2.4.2",
+		"update-notifier": "^7.0.0"
 	},
 	"publishConfig": {
 		"access": "public"