Skip to content

fix: respect correctly platform specific files on preview command #4179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions lib/services/livesync/playground/preview-app-files-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ export class PreviewAppFilesService implements IPreviewAppFilesService {
private $logger: ILogger,
private $platformsData: IPlatformsData,
private $projectDataService: IProjectDataService,
private $projectFilesManager: IProjectFilesManager
private $projectFilesManager: IProjectFilesManager,
private $projectFilesProvider: IProjectFilesProvider
) { }

public getInitialFilesPayload(data: IPreviewAppLiveSyncData, platform: string, deviceId?: string): FilesPayload {
Expand All @@ -34,20 +35,29 @@ export class PreviewAppFilesService implements IPreviewAppFilesService {

this.$logger.trace(`Sending ${filesToTransfer.join("\n")}.`);

const rootFilesDir = this.getRootFilesDir(data, platform);
const payloadsToSync = _.map(filesToTransfer, file => this.createFilePayload(file, rootFilesDir, PreviewSdkEventNames.CHANGE_EVENT_NAME));
const payloadsToRemove = _.map(filesToRemove, file => this.createFilePayload(file, rootFilesDir, PreviewSdkEventNames.UNLINK_EVENT_NAME));
const payloads = payloadsToSync.concat(payloadsToRemove);
const files = this.createFilePayloads(data, platform, filesToTransfer, filesToRemove);

return {
files: payloads,
platform: platform,
files,
platform,
hmrMode: data.useHotModuleReload ? 1 : 0,
deviceId
};
}

private createFilePayload(file: string, rootFilesDir: string, event: string): FilePayload {
private createFilePayloads(data: IPreviewAppLiveSyncData, platform: string, filesToTransfer: string[], filesToRemove: string[]): FilePayload[] {
const rootFilesDir = this.getRootFilesDir(data, platform);
const payloadsToSync = _.filter(filesToTransfer, file => {
const fileInfo = this.$projectFilesProvider.getProjectFileInfo(file, platform, {});
return fileInfo && fileInfo.shouldIncludeFile;
})
.map(file => this.createFilePayload(file, platform, rootFilesDir, PreviewSdkEventNames.CHANGE_EVENT_NAME));
const payloadsToRemove = _.map(filesToRemove, file => this.createFilePayload(file, platform, rootFilesDir, PreviewSdkEventNames.UNLINK_EVENT_NAME));
const payloads = payloadsToSync.concat(payloadsToRemove);
return payloads;
}

private createFilePayload(file: string, platform: string, rootFilesDir: string, event: string): FilePayload {
let fileContents = "";
let binary = false;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,13 @@ export class PreviewAppLiveSyncService implements IPreviewAppLiveSyncService {
}

private async syncFilesForPlatformSafe(data: IPreviewAppLiveSyncData, filesData: IPreviewAppFilesData, platform: string, deviceId?: string): Promise<void> {
this.$logger.info(`Start syncing changes for platform ${platform}.`);

try {
const payloads = this.$previewAppFilesService.getFilesPayload(data, filesData, platform);
await this.$previewSdkService.applyChanges(payloads);
this.$logger.info(`Successfully synced ${payloads.files.map(filePayload => filePayload.file.yellow)} for platform ${platform}.`);
if (payloads && payloads.files && payloads.files.length) {
this.$logger.info(`Start syncing changes for platform ${platform}.`);
await this.$previewSdkService.applyChanges(payloads);
this.$logger.info(`Successfully synced ${payloads.files.map(filePayload => filePayload.file.yellow)} for platform ${platform}.`);
}
} catch (err) {
this.$logger.warn(`Unable to apply changes for platform ${platform}. Error is: ${err}, ${stringify(err)}.`);
}
Expand Down
8 changes: 8 additions & 0 deletions test/services/playground/preview-app-files-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ function createTestInjector(data?: { files: string[] }) {
injector.register("projectFilesManager", {
getProjectFiles: () => data ? data.files : []
});
injector.register("projectFilesProvider", {
getProjectFileInfo: (filePath: string, platform: string) => {
return {
filePath,
shouldIncludeFile: true
};
}
});
return injector;
}

Expand Down