Skip to content

Commit 39c54c3

Browse files
fix: set correct nativePrepare value
As buildData has nativePrepare property, when using the runController. Set the nativePrepare last in the merged object.
1 parent 4970d21 commit 39c54c3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/controllers/run-controller.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,9 @@ export class RunController extends EventEmitter implements IRunController {
244244
const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, device.deviceInfo.platform,
245245
{
246246
...liveSyncInfo,
247-
watch: !liveSyncInfo.skipWatcher,
248-
nativePrepare: { skipNativePrepare: !!deviceDescriptor.skipNativePrepare },
249247
...deviceDescriptor.buildData,
248+
nativePrepare: { skipNativePrepare: !!deviceDescriptor.skipNativePrepare },
249+
watch: !liveSyncInfo.skipWatcher,
250250
});
251251

252252
const prepareResultData = await this.$prepareController.prepare(prepareData);
@@ -321,9 +321,9 @@ export class RunController extends EventEmitter implements IRunController {
321321
const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, device.deviceInfo.platform,
322322
{
323323
...liveSyncInfo,
324-
watch: !liveSyncInfo.skipWatcher,
325-
nativePrepare: { skipNativePrepare: !!deviceDescriptor.skipNativePrepare },
326324
...deviceDescriptor.buildData,
325+
nativePrepare: { skipNativePrepare: !!deviceDescriptor.skipNativePrepare },
326+
watch: !liveSyncInfo.skipWatcher,
327327
});
328328

329329
try {

0 commit comments

Comments
 (0)