Skip to content

Commit 5986b60

Browse files
committed
Skip copy of app_resources and tns_modules when preparing platform for sync to preview app
1 parent f278202 commit 5986b60

7 files changed

+1168
-1151
lines changed

lib/definitions/platform.d.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ interface IOptionalProjectChangesInfoComposition {
352352
}
353353

354354
interface IPreparePlatformCoreInfo extends IPreparePlatformInfoBase, IOptionalProjectChangesInfoComposition {
355-
platformSpecificData: IPlatformSpecificData
355+
platformSpecificData: IPlatformSpecificData;
356356
}
357357

358358
interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, IPlatformTemplate, ISkipNativeCheckOptional { }
@@ -369,7 +369,10 @@ interface IOptionalFilesToRemove {
369369
filesToRemove?: string[];
370370
}
371371

372-
interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition { }
372+
interface IPreparePlatformInfoBase extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IEnvOptions, IOptionalFilesToSync, IOptionalFilesToRemove, IOptionalNativePrepareComposition {
373+
skipCopyTnsModules?: boolean;
374+
skipCopyAppResourcesFiles?: boolean;
375+
}
373376

374377
interface IOptionalNativePrepareComposition {
375378
nativePrepare?: INativePrepare;

lib/services/livesync/playground/preview-app-livesync-service.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
5353
const platform = device.platform;
5454
const projectData = this.$projectDataService.getProjectData(projectDir);
5555
const platformData = this.$platformsData.getPlatformData(platform, projectData);
56-
56+
5757
await this.preparePlatform(platform, appFilesUpdaterOptions, env, projectData);
5858

5959
const payloads = this.getFilePayloads(platformData, projectData, files);
@@ -89,7 +89,6 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
8989
};
9090
});
9191

92-
9392
return payloads;
9493
}
9594

@@ -104,7 +103,9 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
104103
projectData,
105104
nativePrepare,
106105
config,
107-
platformTemplate
106+
platformTemplate,
107+
skipCopyTnsModules: true,
108+
skipCopyAppResourcesFiles: true
108109
};
109110
await this.$platformService.preparePlatform(prepareInfo);
110111
}

lib/services/livesync/playground/preview-sdk-service.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ export class PreviewSdkService extends EventEmitter implements IPreviewSdkServic
6767
this.emit(PreviewSdkEventNames.DEVICE_CONNECTED, device);
6868
this.connectedDevices.push(device);
6969
},
70-
onDevicesPresence: (devices: Device[]) => {
71-
},
70+
onDevicesPresence: (devices: Device[]) => ({ }),
7271
onSendingChange: (sending: boolean) => ({ })
7372
};
7473
}

lib/services/platform-service.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
226226
platformInfo.filesToSync,
227227
platformInfo.filesToRemove,
228228
platformInfo.nativePrepare,
229+
platformInfo.skipCopyAppResourcesFiles,
230+
platformInfo.skipCopyTnsModules
229231
);
230232
this.$projectChangesService.savePrepareInfo(platformInfo.platform, platformInfo.projectData);
231233
} else {
@@ -297,7 +299,9 @@ export class PlatformService extends EventEmitter implements IPlatformService {
297299
changesInfo?: IProjectChangesInfo,
298300
filesToSync?: string[],
299301
filesToRemove?: string[],
300-
nativePrepare?: INativePrepare): Promise<void> {
302+
nativePrepare?: INativePrepare,
303+
skipCopyAppResourcesFiles?: boolean,
304+
skipCopyTnsModules?: boolean): Promise<void> {
301305

302306
this.$logger.out("Preparing project...");
303307

@@ -313,7 +317,9 @@ export class PlatformService extends EventEmitter implements IPlatformService {
313317
changesInfo,
314318
filesToSync,
315319
filesToRemove,
316-
env
320+
env,
321+
skipCopyAppResourcesFiles,
322+
skipCopyTnsModules
317323
});
318324

319325
if (!nativePrepare || !nativePrepare.skipNativePrepare) {

lib/services/prepare-platform-js-service.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ export class PreparePlatformJSService extends PreparePlatformService implements
3636
public async preparePlatform(config: IPreparePlatformJSInfo): Promise<void> {
3737
if (!config.changesInfo || config.changesInfo.appFilesChanged || config.changesInfo.changesRequirePrepare) {
3838
await this.copyAppFiles(config);
39+
if (!config.skipCopyAppResourcesFiles) {
40+
this.copyAppResourcesFiles(config);
41+
}
42+
}
43+
44+
if (!this.$fs.exists(path.join(config.platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME))) {
3945
this.copyAppResourcesFiles(config);
4046
}
4147

@@ -49,7 +55,9 @@ export class PreparePlatformJSService extends PreparePlatformService implements
4955
}
5056

5157
if (!config.changesInfo || config.changesInfo.modulesChanged) {
52-
await this.copyTnsModules(config.platform, config.platformData, config.projectData, config.appFilesUpdaterOptions, config.projectFilesConfig);
58+
if (!config.skipCopyTnsModules) {
59+
await this.copyTnsModules(config.platform, config.platformData, config.projectData, config.appFilesUpdaterOptions, config.projectFilesConfig);
60+
}
5361
}
5462
}
5563

lib/services/qr-code-terminal-service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export class QrCodeTerminalService implements IQrCodeTerminalService {
88

99
try {
1010
qrcode.generate(url);
11-
} catch(err) {
11+
} catch (err) {
1212
this.$logger.trace(`Failed to generate QR code for ${url}`, err);
1313
}
1414
}
1515
}
16-
$injector.register("qrCodeTerminalService", QrCodeTerminalService);
16+
$injector.register("qrCodeTerminalService", QrCodeTerminalService);

0 commit comments

Comments
 (0)