Skip to content

Commit e5b3963

Browse files
committed
fix: avoid marking mode checks in iOS commands
1 parent 3ab06aa commit e5b3963

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

lib/controllers/prepare-controller.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export class PrepareController extends EventEmitter {
1919
private $platformController: IPlatformController,
2020
public $hooksService: IHooksService,
2121
private $logger: ILogger,
22+
private $mobileHelper: Mobile.IMobileHelper,
2223
private $nodeModulesDependenciesBuilder: INodeModulesDependenciesBuilder,
2324
private $platformsDataService: IPlatformsDataService,
2425
private $pluginsService: IPluginsService,
@@ -33,7 +34,9 @@ export class PrepareController extends EventEmitter {
3334

3435
public async prepare(prepareData: IPrepareData): Promise<IPrepareResultData> {
3536
const projectData = this.$projectDataService.getProjectData(prepareData.projectDir);
36-
await this.$markingModeService.handleMarkingModeFullDeprecation({ projectDir: projectData.projectDir });
37+
if (this.$mobileHelper.isAndroidPlatform(prepareData.platform)) {
38+
await this.$markingModeService.handleMarkingModeFullDeprecation({ projectDir: projectData.projectDir });
39+
}
3740

3841
await this.trackRuntimeVersion(prepareData.platform, projectData);
3942
await this.$pluginsService.ensureAllDependenciesAreInstalled(projectData);

lib/controllers/preview-app-controller.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export class PreviewAppController extends EventEmitter implements IPreviewAppCon
2020
private $hmrStatusService: IHmrStatusService,
2121
private $logger: ILogger,
2222
public $hooksService: IHooksService,
23+
private $mobileHelper: Mobile.IMobileHelper,
2324
private $pluginsService: IPluginsService,
2425
private $prepareController: PrepareController,
2526
private $previewAppFilesService: IPreviewAppFilesService,
@@ -58,7 +59,10 @@ export class PreviewAppController extends EventEmitter implements IPreviewAppCon
5859
const projectData = this.$projectDataService.getProjectData(data.projectDir);
5960
await this.$pluginsService.ensureAllDependenciesAreInstalled(projectData);
6061
await this.$previewSdkService.initialize(data.projectDir, async (device: Device) => {
61-
await this.$markingModeService.handleMarkingModeFullDeprecation({ projectDir: projectData.projectDir });
62+
if (this.$mobileHelper.isAndroidPlatform(device.platform)) {
63+
await this.$markingModeService.handleMarkingModeFullDeprecation({ projectDir: projectData.projectDir });
64+
}
65+
6266
try {
6367
if (!device) {
6468
this.$errors.fail("Sending initial preview files without a specified device is not supported.");

test/controllers/prepare-controller.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { assert } from "chai";
22
import { PrepareController } from "../../lib/controllers/prepare-controller";
3+
import { MobileHelper } from "../../lib/common/mobile/mobile-helper";
34
import { InjectorStub } from "../stubs";
45
import { PREPARE_READY_EVENT_NAME } from "../../lib/constants";
56

@@ -44,6 +45,8 @@ function createTestInjector(data: { hasNativeChanges: boolean }): IInjector {
4445
}
4546
}));
4647

48+
injector.register("mobileHelper", MobileHelper);
49+
4750
injector.register("prepareController", PrepareController);
4851

4952
injector.register("nodeModulesDependenciesBuilder", {

0 commit comments

Comments
 (0)