feat: add invoking CLI's scripts for launching Metro in run-ios command
#2021
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,13 +13,22 @@ import tryRunAdbReverse from './tryRunAdbReverse'; | |
| import tryLaunchAppOnDevice from './tryLaunchAppOnDevice'; | ||
| import tryInstallAppOnDevice from './tryInstallAppOnDevice'; | ||
| import getAdbPath from './getAdbPath'; | ||
| import { | ||
| logger, | ||
| CLIError, | ||
| link, | ||
| getDefaultUserTerminal, | ||
| isPackagerRunning, | ||
| logAlreadyRunningBundler, | ||
| startServerInNewWindow, | ||
| handlePortUnavailable, | ||
| } from '@react-native-community/cli-tools'; | ||
| import {getAndroidProject} from '../../config/getAndroidProject'; | ||
| import listAndroidDevices from './listAndroidDevices'; | ||
| import tryLaunchEmulator from './tryLaunchEmulator'; | ||
| import chalk from 'chalk'; | ||
| import path from 'path'; | ||
| import {build, BuildFlags, options} from '../buildAndroid'; | ||
| import {promptForTaskSelection} from './listAndroidTasks'; | ||
| import {getTaskNames} from './getTaskNames'; | ||
| import {checkUsers, promptForUser} from './listAndroidUsers'; | ||
|
|
@@ -28,6 +37,9 @@ export interface Flags extends BuildFlags { | |
| appId: string; | ||
| appIdSuffix: string; | ||
| mainActivity: string; | ||
| port: number; | ||
| terminal?: string; | ||
| packager?: boolean; | ||
| deviceId?: string; | ||
| listDevices?: boolean; | ||
| binaryPath?: string; | ||
|
|
@@ -42,6 +54,35 @@ export type AndroidProject = NonNullable<Config['project']['android']>; | |
| async function runAndroid(_argv: Array<string>, config: Config, args: Flags) { | ||
| link.setPlatform('android'); | ||
|
|
||
| let {packager, port} = args; | ||
|
|
||
| const packagerStatus = await isPackagerRunning(port); | ||
|
|
||
| if ( | ||
| typeof packagerStatus === 'object' && | ||
| packagerStatus.status === 'running' | ||
| ) { | ||
| if (packagerStatus.root === config.root) { | ||
| packager = false; | ||
| logAlreadyRunningBundler(port); | ||
| } else { | ||
| const result = await handlePortUnavailable(port, config.root, packager); | ||
| [port, packager] = [result.port, result.packager]; | ||
| } | ||
| } else if (packagerStatus === 'unrecognized') { | ||
| const result = await handlePortUnavailable(port, config.root, packager); | ||
| [port, packager] = [result.port, result.packager]; | ||
| } | ||
|
|
||
| if (packager) { | ||
| await startServerInNewWindow( | ||
|
Contributor
There was a problem hiding this comment. await causes the CLI to hang indefinitely. Must be called without await. |
||
| port, | ||
| config.root, | ||
| config.reactNativePath, | ||
| args.terminal, | ||
| ); | ||
| } | ||
|
|
||
| if (config.reactNativeVersion !== 'unknown') { | ||
| link.setVersion(config.reactNativeVersion); | ||
| } | ||
|
|
@@ -66,7 +107,6 @@ async function runAndroid(_argv: Array<string>, config: Config, args: Flags) { | |
|
|
||
| const androidProject = getAndroidProject(config); | ||
|
|
||
| return buildAndRun(args, androidProject); | ||
| } | ||
|
|
||
|
|
@@ -269,6 +309,21 @@ export default { | |
| func: runAndroid, | ||
| options: [ | ||
| ...options, | ||
| { | ||
| name: '--no-packager', | ||
| description: 'Do not launch packager while running the app', | ||
| }, | ||
| { | ||
| name: '--port <number>', | ||
| default: process.env.RCT_METRO_PORT || 8081, | ||
| parse: Number, | ||
| }, | ||
| { | ||
| name: '--terminal <string>', | ||
| description: | ||
| 'Launches the Metro Bundler in a new window using the specified terminal path.', | ||
| default: getDefaultUserTerminal(), | ||
| }, | ||
| { | ||
| name: '--appId <string>', | ||
| description: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.