Skip to content

chore: merge release into master #5009

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.

Sign up for GitHub

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 5 commits into from
Sep 4, 2019
Merged

chore: merge release into master #5009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02216b0
fix: force refresh with socket when debugging the application
Fatme Sep 2, 2019
da293d9
Merge pull request #5006 from NativeScript/fatme/debug-with-socket
Fatme Sep 2, 2019
76cb16b
fix: update `plugin create` command description
elena-p Sep 2, 2019
cbfa639
Merge pull request #5004 from NativeScript/hristova/update-command-de…
Fatme Sep 2, 2019
7c90cce
Merge branch 'release' into fatme/merge-release-6.1.0
Fatme Sep 3, 2019
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
2 changes: 1 addition & 1 deletion docs/man_pages/lib-management/plugin.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ Command | Description
[plugin remove](plugin-remove.html) | Uninstalls the specified plugin and its dependencies.
[plugin update](plugin-update.html) | Updates the specified plugin(s) and its dependencies.
[plugin build](plugin-build.html) | Builds the Android project of a NativeScript plugin, and updates the `include.gradle`.
[plugin create](plugin-create.html) | Builds the Android project of a NativeScript plugin, and updates the `include.gradle`.
[plugin create](plugin-create.html) | Creates a new project for NativeScript plugin development.
<% } %>
1 change: 1 addition & 0 deletions lib/controllers/run-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ export class RunController extends EventEmitter implements IRunController {
const debugOptions = deviceDescriptor.debugOptions || {};

liveSyncResultInfo.waitForDebugger = !!debugOptions.debugBrk;
liveSyncResultInfo.forceRefreshWithSocket = true;

const refreshInfo = await this.refreshApplicationWithoutDebug(projectData, liveSyncResultInfo, filesChangeEventData, deviceDescriptor, { shouldSkipEmitLiveSyncNotification: true, shouldCheckDeveloperDiscImage: true });

Expand Down
3 changes: 2 additions & 1 deletion lib/definitions/livesync.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ declare global {
isFullSync: boolean;
waitForDebugger?: boolean;
deviceAppData: Mobile.IDeviceAppData;
didRecover?: boolean
didRecover?: boolean;
forceRefreshWithSocket?: boolean;
}

interface IAndroidLiveSyncResultInfo extends ILiveSyncResultInfo, IAndroidLivesyncSyncOperationResult { }
Expand Down
14 changes: 9 additions & 5 deletions lib/services/livesync/ios-device-livesync-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
super(platformsDataService, device);
}

private canRefreshWithNotification(projectData: IProjectData): boolean {
private canRefreshWithNotification(projectData: IProjectData, liveSyncInfo?: ILiveSyncResultInfo): boolean {
if (liveSyncInfo && liveSyncInfo.forceRefreshWithSocket) {
return false;
}

if (this.device.isEmulator) {
return false;
}
Expand Down Expand Up @@ -72,7 +76,7 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
shouldRestart = true;
} else {
const canExecuteFastSync = this.canExecuteFastSyncForPaths(liveSyncInfo, localToDevicePaths, projectData, deviceAppData.platform);
const isRefreshConnectionSetup = this.canRefreshWithNotification(projectData) || (!this.device.isOnlyWiFiConnected && await this.setupSocketIfNeeded(projectData));
const isRefreshConnectionSetup = this.canRefreshWithNotification(projectData, liveSyncInfo) || (!this.device.isOnlyWiFiConnected && await this.setupSocketIfNeeded(projectData));
if (!canExecuteFastSync || !isRefreshConnectionSetup) {
shouldRestart = true;
}
Expand All @@ -93,7 +97,7 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen

try {
if (otherFiles.length) {
didRefresh = await this.refreshApplicationCore(projectData);
didRefresh = await this.refreshApplicationCore(projectData, liveSyncInfo);
}
} catch (e) {
didRefresh = false;
Expand All @@ -102,9 +106,9 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
return didRefresh;
}

private async refreshApplicationCore(projectData: IProjectData) {
private async refreshApplicationCore(projectData: IProjectData, liveSyncInfo: ILiveSyncResultInfo) {
let didRefresh = true;
if (this.canRefreshWithNotification(projectData)) {
if (this.canRefreshWithNotification(projectData, liveSyncInfo)) {
didRefresh = await this.refreshWithNotification(projectData);
} else {
if (await this.setupSocketIfNeeded(projectData)) {
Expand Down