Skip to content
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.

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

Added Run Windows and Run macOS commands to Command Palette #1576

Merged
merged 17 commits into from
Jun 7, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
12 changes: 12 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@
"category": "React Native",
"enablement": "!config.security.workspace.trust.enabled || isWorkspaceTrusted"
},
{
"command": "reactNative.runWindows",
"title": "%reactNative.command.runWindows.title%",
"category": "React Native",
"enablement": "isWorkspaceTrusted"
},
{
"command": "reactNative.runMacos",
"title": "%reactNative.command.runMacos.title%",
"category": "React Native",
"enablement": "isWorkspaceTrusted"
},
{
"command": "reactNative.startPackager",
"title": "%reactNative.command.startPackager.title%",
Expand Down
2 changes: 2 additions & 0 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"reactNative.command.runIosSimulator.title": "Run iOS on Simulator",
"reactNative.command.runIosDevice.title": "Run iOS on Device",
"reactNative.command.runExponent.title": "Run Expo",
"reactNative.command.runWindows.title": "Run Windows",
"reactNative.command.runMacos.title": "Run Macos",
etatanova marked this conversation as resolved.
Show resolved Hide resolved
"reactNative.command.startPackager.title": "Start Packager",
"reactNative.command.stopPackager.title": "Stop Packager",
"reactNative.command.restartPackager.title": "Restart Packager",
Expand Down
2 changes: 2 additions & 0 deletions src/common/error/internalErrorCode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ export enum InternalErrorCode {
FailedToPublishToExpHost = 111,
UnsupportedCommandStatus = 112,
CommandFailedWithDetails = 113,
FailedToRunOnWindows = 114,
FailedToRunOnMacos = 115,

// Device Deployer errors
IOSDeployNotFound = 201,
Expand Down
105 changes: 98 additions & 7 deletions src/extension/commandPaletteHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,17 @@ import { TargetType, GeneralMobilePlatform } from "./generalMobilePlatform";
import { AndroidPlatform } from "./android/androidPlatform";
import { IOSPlatform } from "./ios/iOSPlatform";
import { ProjectVersionHelper } from "../common/projectVersionHelper";
import { ReactNativeProjectHelper } from "../common/reactNativeProjectHelper";
import { ParsedPackage, ReactNativeProjectHelper } from "../common/reactNativeProjectHelper";
import { TargetPlatformHelper } from "../common/targetPlatformHelper";
import { TelemetryHelper } from "../common/telemetryHelper";
import { ProjectsStorage } from "./projectsStorage";
import { IAndroidRunOptions, IIOSRunOptions, PlatformType } from "./launchArgs";
import {
IAndroidRunOptions,
IIOSRunOptions,
ImacOSRunOptions,
IWindowsRunOptions,
PlatformType,
} from "./launchArgs";
import { ExponentPlatform } from "./exponent/exponentPlatform";
import { spawn, ChildProcess } from "child_process";
import { HostPlatform } from "../common/hostPlatform";
Expand All @@ -33,6 +39,8 @@ import { LogCatMonitor } from "./android/logCatMonitor";
import { LogCatMonitorManager } from "./android/logCatMonitorManager";
import { NetworkInspectorServer } from "./networkInspector/networkInspectorServer";
import { InspectorViewFactory } from "./networkInspector/views/inspectorViewFactory";
import { WindowsPlatform } from "./windows/windowsPlatform";
import { MacOSPlatform } from "./macos/macOSPlatform";
nls.config({
messageFormat: nls.MessageFormat.bundle,
bundleFormat: nls.BundleFormat.standalone,
Expand Down Expand Up @@ -301,6 +309,76 @@ export class CommandPaletteHandler {
});
}

public static runWindows(): Promise<void> {
const additionalPackagesToCheck: ParsedPackage[] = [
{
packageName: "react-native-windows",
useSemverCoerce: false,
},
];
return this.selectProject().then((appLauncher: AppLauncher) => {
TargetPlatformHelper.checkTargetPlatformSupport(PlatformType.Android);
return ProjectVersionHelper.getReactNativePackageVersionsFromNodeModules(
appLauncher.getPackager().getProjectPath(),
additionalPackagesToCheck,
).then(versions => {
appLauncher.setReactNativeVersions(versions);
return this.executeCommandInContext(
"runWindows",
appLauncher.getWorkspaceFolder(),
() => {
const platform = <WindowsPlatform>(
this.createPlatform(appLauncher, PlatformType.Windows, WindowsPlatform)
);
return platform
.beforeStartPackager()
.then(() => {
return platform.startPackager();
})
.then(() => {
return platform.runApp();
etatanova marked this conversation as resolved.
Show resolved Hide resolved
});
},
);
});
});
}

public static runMacos(): Promise<void> {
const additionalPackagesToCheck: ParsedPackage[] = [
{
packageName: "react-native-macos",
useSemverCoerce: false,
},
];
return this.selectProject().then((appLauncher: AppLauncher) => {
TargetPlatformHelper.checkTargetPlatformSupport(PlatformType.Android);
return ProjectVersionHelper.getReactNativePackageVersionsFromNodeModules(
appLauncher.getPackager().getProjectPath(),
additionalPackagesToCheck,
).then(versions => {
appLauncher.setReactNativeVersions(versions);
return this.executeCommandInContext(
"runMacos",
appLauncher.getWorkspaceFolder(),
() => {
const platform = <MacOSPlatform>(
this.createPlatform(appLauncher, PlatformType.macOS, MacOSPlatform)
);
return platform
.beforeStartPackager()
.then(() => {
return platform.startPackager();
})
.then(() => {
return platform.runApp();
});
},
);
});
});
}

public static showDevMenu(): Promise<void> {
return this.selectProject().then((appLauncher: AppLauncher) => {
const androidPlatform = <AndroidPlatform>(
Expand Down Expand Up @@ -569,7 +647,12 @@ export class CommandPaletteHandler {

private static createPlatform(
appLauncher: AppLauncher,
platform: PlatformType.iOS | PlatformType.Android | PlatformType.Exponent,
platform:
| PlatformType.iOS
| PlatformType.Android
| PlatformType.Exponent
| PlatformType.Windows
| PlatformType.macOS,
platformClass: typeof GeneralMobilePlatform,
target?: TargetType,
): GeneralMobilePlatform {
Expand Down Expand Up @@ -741,9 +824,14 @@ export class CommandPaletteHandler {

private static getRunOptions(
appLauncher: AppLauncher,
platform: PlatformType.iOS | PlatformType.Android | PlatformType.Exponent,
platform:
| PlatformType.iOS
| PlatformType.Android
| PlatformType.Exponent
| PlatformType.Windows
| PlatformType.macOS,
target: TargetType = "simulator",
): IAndroidRunOptions | IIOSRunOptions {
): IAndroidRunOptions | IIOSRunOptions | IWindowsRunOptions | ImacOSRunOptions {
const packagerPort = SettingsHelper.getPackagerPort(
appLauncher.getWorkspaceFolderUri().fsPath,
);
Expand All @@ -765,9 +853,12 @@ export class CommandPaletteHandler {
const projectRoot = SettingsHelper.getReactNativeProjectRoot(
appLauncher.getWorkspaceFolderUri().fsPath,
);

const nodeModulesRoot: string = appLauncher.getOrUpdateNodeModulesRoot();
const runOptions: IAndroidRunOptions | IIOSRunOptions = {
const runOptions:
| IAndroidRunOptions
| IIOSRunOptions
| IWindowsRunOptions
| ImacOSRunOptions = {
platform: platform,
workspaceRoot: appLauncher.getWorkspaceFolderUri().fsPath,
projectRoot: projectRoot,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,22 @@ export class ReactNativeDebugConfigProvider implements vscode.DebugConfiguration
platform: PlatformType.iOS,
enableDebug: false,
},
"Run Windows": {
name: "Run Windows",
cwd: "${workspaceFolder}",
type: DEBUG_TYPES.REACT_NATIVE,
request: "launch",
platform: PlatformType.Windows,
enableDebug: false,
},
"Run Macos": {
name: "Run Macos",
cwd: "${workspaceFolder}",
type: DEBUG_TYPES.REACT_NATIVE,
request: "launch",
platform: PlatformType.macOS,
enableDebug: false,
},
"Run Android Hermes - Experimental": {
name: "Run Android Hermes - Experimental",
cwd: "${workspaceFolder}",
Expand Down
10 changes: 10 additions & 0 deletions src/extension/rn-extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,16 @@ function registerReactNativeCommands(): void {
ErrorHelper.getInternalError(InternalErrorCode.FailedToRunExponent),
() => CommandPaletteHandler.runExponent(),
);
registerVSCodeCommand(
"runWindows",
ErrorHelper.getInternalError(InternalErrorCode.FailedToRunOnWindows),
() => CommandPaletteHandler.runWindows(),
);
registerVSCodeCommand(
"runMacos",
ErrorHelper.getInternalError(InternalErrorCode.FailedToRunOnMacos),
() => CommandPaletteHandler.runMacos(),
);
registerVSCodeCommand(
"startPackager",
ErrorHelper.getInternalError(InternalErrorCode.FailedToStartPackager),
Expand Down