Skip to content

Use moduleResolution classic when syncAllFiles option is not specified #3436

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 1 commit into from
Mar 13, 2018
Merged

Use moduleResolution classic when syncAllFiles option is not specified #3436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/declarations.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ interface IEnvOptions {

interface IAndroidBuildOptionsSettings extends IAndroidReleaseOptions, IRelease { }

interface IAppFilesUpdaterOptions extends IBundle, IRelease { }
interface IAppFilesUpdaterOptions extends IBundle, IRelease, IOptionalWatchAllFiles { }

interface IPlatformBuildData extends IAppFilesUpdaterOptions, IBuildConfig, IEnvOptions { }

Expand Down
4 changes: 4 additions & 0 deletions lib/definitions/platform.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,10 @@ interface IOptionalNativePrepareComposition {
nativePrepare?: INativePrepare;
}

interface IOptionalWatchAllFiles {
watchAllFiles?: boolean;
}

interface IDeployPlatformInfo extends IPlatform, IAppFilesUpdaterOptionsComposition, IProjectDataComposition, IPlatformConfig, IEnvOptions, IOptionalNativePrepareComposition, IOptionalOutputPath, IBuildPlatformAction {
deployOptions: IDeployPlatformOptions
}
Expand Down
5 changes: 4 additions & 1 deletion lib/services/livesync/livesync-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
appFilesUpdaterOptions: {
bundle: options.bundle,
release: options.release,
watchAllFiles: options.liveSyncData.watchAllFiles
},
projectData: options.projectData,
env: options.env,
Expand Down Expand Up @@ -577,6 +578,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
rebuiltInformation,
projectData,
deviceBuildInfoDescriptor,
liveSyncData,
settings: latestAppPackageInstalledSettings,
modifiedFiles: allModifiedFiles,
filesToRemove: currentFilesToRemove,
Expand Down Expand Up @@ -637,7 +639,8 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
env: liveSyncData.env,
appFilesUpdaterOptions: {
bundle: liveSyncData.bundle,
release: liveSyncData.release
release: liveSyncData.release,
watchAllFiles: liveSyncData.watchAllFiles
},
platforms
},
Expand Down
11 changes: 10 additions & 1 deletion lib/services/platform-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,16 @@ export class PlatformService extends EventEmitter implements IPlatformService {

/* Hooks are expected to use "filesToSync" parameter, as to give plugin authors additional information about the sync process.*/
@helpers.hook('prepare')
private async preparePlatformCore(platform: string, appFilesUpdaterOptions: IAppFilesUpdaterOptions, projectData: IProjectData, platformSpecificData: IPlatformSpecificData, env: Object, changesInfo?: IProjectChangesInfo, filesToSync?: string[], filesToRemove?: string[], nativePrepare?: INativePrepare): Promise<void> {
private async preparePlatformCore(platform: string,
appFilesUpdaterOptions: IAppFilesUpdaterOptions,
projectData: IProjectData,
platformSpecificData: IPlatformSpecificData,
env: Object,
changesInfo?: IProjectChangesInfo,
filesToSync?: string[],
filesToRemove?: string[],
nativePrepare?: INativePrepare): Promise<void> {

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

const platformData = this.$platformsData.getPlatformData(platform, projectData);
Expand Down