Skip to content

Commit 1672adc

Browse files
committed
fix: fix deploy with provision
Currently buildData is provided through deviceDescriptor so no need to provide it as a separate argument.
1 parent fe3a348 commit 1672adc

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

lib/controllers/deploy-controller.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ export class DeployController {
77
) { }
88

99
public async deploy(data: IDeployData): Promise<void> {
10-
const { buildData, deviceDescriptors } = data;
10+
const { deviceDescriptors } = data;
1111

1212
const executeAction = async (device: Mobile.IDevice) => {
13-
await this.$prepareController.prepare(buildData);
1413
const deviceDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
14+
await this.$prepareController.prepare(deviceDescriptor.buildData);
1515
const packageFilePath = await deviceDescriptor.buildAction();
16-
await this.$deviceInstallAppService.installOnDevice(device, { ...buildData, buildForDevice: !device.isEmulator }, packageFilePath);
16+
await this.$deviceInstallAppService.installOnDevice(device, { ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator }, packageFilePath);
1717
};
1818

1919
await this.$devicesService.execute(executeAction, (device: Mobile.IDevice) => _.some(deviceDescriptors, deviceDescriptor => deviceDescriptor.identifier === device.deviceInfo.identifier));

lib/definitions/run.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ declare global {
88
}
99

1010
interface IDeployData {
11-
buildData: IBuildData;
1211
deviceDescriptors: ILiveSyncDeviceDescriptor[];
1312
}
1413

lib/helpers/deploy-command-helper.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class DeployCommandHelper {
3232
projectDir: this.$projectData.projectDir
3333
});
3434

35-
const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, { ...this.$options, outputPath, buildForDevice: !d.isEmulator });
35+
const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, { ...this.$options.argv, outputPath, buildForDevice: !d.isEmulator, skipWatcher: !this.$options.watch });
3636

3737
const buildAction = additionalOptions && additionalOptions.buildPlatform ?
3838
additionalOptions.buildPlatform.bind(additionalOptions.buildPlatform, d.deviceInfo.platform, buildData, this.$projectData) :
@@ -50,10 +50,7 @@ export class DeployCommandHelper {
5050
return info;
5151
});
5252

53-
await this.$deployController.deploy({
54-
buildData: this.$buildDataService.getBuildData(this.$projectData.projectDir, platform, { ...this.$options.argv, skipWatcher: !this.$options.watch }),
55-
deviceDescriptors
56-
});
53+
await this.$deployController.deploy({ deviceDescriptors });
5754
}
5855
}
5956
$injector.register("deployCommandHelper", DeployCommandHelper);

lib/helpers/livesync-command-helper.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
100100
const { liveSyncInfo, deviceDescriptors } = await this.executeLiveSyncOperationCore(devices, platform, additionalOptions);
101101

102102
if (this.$options.release) {
103-
await this.runInRelease(platform, deviceDescriptors, liveSyncInfo);
103+
await this.runInRelease(platform, deviceDescriptors);
104104
return;
105105
}
106106

@@ -160,7 +160,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
160160
return { liveSyncInfo, deviceDescriptors };
161161
}
162162

163-
private async runInRelease(platform: string, deviceDescriptors: ILiveSyncDeviceDescriptor[], liveSyncInfo: ILiveSyncInfo): Promise<void> {
163+
private async runInRelease(platform: string, deviceDescriptors: ILiveSyncDeviceDescriptor[]): Promise<void> {
164164
await this.$devicesService.initialize({
165165
platform,
166166
deviceId: this.$options.device,
@@ -169,12 +169,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
169169
sdk: this.$options.sdk
170170
});
171171

172-
const buildData = this.$buildDataService.getBuildData(liveSyncInfo.projectDir, platform, { ...this.$options.argv, clean: true, watch: false });
173-
174-
await this.$deployController.deploy({
175-
buildData,
176-
deviceDescriptors
177-
});
172+
await this.$deployController.deploy({ deviceDescriptors });
178173

179174
for (const deviceDescriptor of deviceDescriptors) {
180175
const device = this.$devicesService.getDeviceByIdentifier(deviceDescriptor.identifier);

0 commit comments

Comments
 (0)