Skip to content

Commit 6a28d8f

Browse files
Merge pull request #4672 from NativeScript/fatme/cloud-run
fix: fix cloud run command
2 parents a30bedb + 72d5f6d commit 6a28d8f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

lib/controllers/run-controller.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,12 +299,11 @@ export class RunController extends EventEmitter implements IRunController {
299299
const deviceDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
300300
const platformData = this.$platformsDataService.getPlatformData(data.platform, projectData);
301301
const prepareData = this.$prepareDataService.getPrepareData(projectData.projectDir, data.platform, { ...liveSyncInfo, watch: !liveSyncInfo.skipWatcher });
302-
const buildData = this.$buildDataService.getBuildData(projectData.projectDir, data.platform, { ...liveSyncInfo, outputPath: deviceDescriptor.outputPath });
303302

304303
try {
305304
if (data.hasNativeChanges) {
306305
await this.$prepareNativePlatformService.prepareNativePlatform(platformData, projectData, prepareData);
307-
await this.$buildController.build(buildData);
306+
await deviceDescriptor.buildAction();
308307
}
309308

310309
const isInHMRMode = liveSyncInfo.useHotModuleReload && data.hmrData && data.hmrData.hash;

lib/helpers/livesync-command-helper.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
7777
keyStorePassword: this.$options.keyStorePassword
7878
};
7979

80-
const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, buildConfig);
81-
82-
const buildAction = additionalOptions && additionalOptions.buildPlatform ?
83-
additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildConfig, this.$projectData) :
84-
this.$buildController.build.bind(this.$buildController, buildData);
85-
8680
const outputPath = additionalOptions && additionalOptions.getOutputDirectory && additionalOptions.getOutputDirectory({
8781
platform: d.deviceInfo.platform,
8882
emulator: d.isEmulator,
8983
projectDir: this.$projectData.projectDir
9084
});
9185

86+
const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, { ...buildConfig, outputPath });
87+
88+
const buildAction = additionalOptions && additionalOptions.buildPlatform ?
89+
additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildConfig, this.$projectData) :
90+
this.$buildController.build.bind(this.$buildController, buildData);
91+
9292
const info: ILiveSyncDeviceDescriptor = {
9393
identifier: d.deviceInfo.identifier,
9494
buildAction,

0 commit comments

Comments
 (0)