Merge pull request #4719 from NativeScript/fatme/fix-cloud-build

Dimitar Tachev · web-flow · commit ac38f16e1a32 · 2019-06-13T17:17:17.000+03:00
fix: save correct .nsprepareinfo file on cloud commands
diff --git a/lib/controllers/prepare-controller.ts b/lib/controllers/prepare-controller.ts
@@ -47,7 +47,7 @@ export class PrepareController extends EventEmitter {
 			result = { hasNativeChanges, platform: prepareData.platform.toLowerCase() };
 		}
 
-		this.$projectChangesService.savePrepareInfo(platformData);
+		await this.$projectChangesService.savePrepareInfo(platformData, projectData, prepareData);
 
 		this.$logger.info(`Project successfully prepared (${prepareData.platform.toLowerCase()})`);
 
diff --git a/lib/services/platform/add-platform-service.ts b/lib/services/platform/add-platform-service.ts
@@ -61,7 +61,7 @@ export class AddPlatformService implements IAddPlatformService {
 		platformData.platformProjectService.ensureConfigurationFileInAppResources(projectData);
 		await platformData.platformProjectService.interpolateData(projectData);
 		platformData.platformProjectService.afterCreateProject(platformData.projectRoot, projectData);
-		this.$projectChangesService.setNativePlatformStatus(platformData, { nativePlatformStatus: NativePlatformStatus.requiresPrepare });
+		await this.$projectChangesService.setNativePlatformStatus(platformData, projectData, { nativePlatformStatus: NativePlatformStatus.requiresPrepare });
 	}
 }
 $injector.register("addPlatformService", AddPlatformService);
diff --git a/lib/services/platform/prepare-native-platform-service.ts b/lib/services/platform/prepare-native-platform-service.ts
@@ -47,7 +47,7 @@ export class PrepareNativePlatformService implements IPrepareNativePlatformServi
 		}
 
 		platformData.platformProjectService.interpolateConfigurationFile(projectData);
-		this.$projectChangesService.setNativePlatformStatus(platformData, { nativePlatformStatus: NativePlatformStatus.alreadyPrepared });
+		await this.$projectChangesService.setNativePlatformStatus(platformData, projectData, { nativePlatformStatus: NativePlatformStatus.alreadyPrepared });
 
 		return hasChanges;
 	}
diff --git a/lib/services/project-changes-service.ts b/lib/services/project-changes-service.ts
@@ -136,12 +136,16 @@ export class ProjectChangesService implements IProjectChangesService {
 		return prepareInfo;
 	}
 
-	public savePrepareInfo(platformData: IPlatformData): void {
+	public async savePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<void> {
+		if (!this._prepareInfo) {
+			await this.ensurePrepareInfo(platformData, projectData, prepareData);
+		}
+
 		const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);
 		this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);
 	}
 
-	public setNativePlatformStatus(platformData: IPlatformData, addedPlatform: IAddedNativePlatform): void {
+	public async setNativePlatformStatus(platformData: IPlatformData, projectData: IProjectData, addedPlatform: IAddedNativePlatform): Promise<void> {
 		this._prepareInfo = this._prepareInfo || this.getPrepareInfo(platformData);
 		if (this._prepareInfo && addedPlatform.nativePlatformStatus === NativePlatformStatus.alreadyPrepared) {
 			this._prepareInfo.nativePlatformStatus = addedPlatform.nativePlatformStatus;
@@ -151,7 +155,7 @@ export class ProjectChangesService implements IProjectChangesService {
 			};
 		}
 
-		this.savePrepareInfo(platformData);
+		await this.savePrepareInfo(platformData, projectData, null);
 	}
 
 	private async ensurePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: PrepareData): Promise<boolean> {
diff --git a/lib/services/webpack/webpack.d.ts b/lib/services/webpack/webpack.d.ts
@@ -19,8 +19,8 @@ declare global {
 		checkForChanges(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<IProjectChangesInfo>;
 		getPrepareInfoFilePath(platformData: IPlatformData): string;
 		getPrepareInfo(platformData: IPlatformData): IPrepareInfo;
-		savePrepareInfo(platformData: IPlatformData): void;
-		setNativePlatformStatus(platformData: IPlatformData, addedPlatform: IAddedNativePlatform): void;
+		savePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<void>;
+		setNativePlatformStatus(platformData: IPlatformData, projectData: IProjectData, addedPlatform: IAddedNativePlatform): void;
 		currentChanges: IProjectChangesInfo;
 	}
 
diff --git a/test/project-changes-service.ts b/test/project-changes-service.ts
@@ -170,9 +170,9 @@ describe("Project Changes Service Tests", () => {
 	});
 
 	describe("setNativePlatformStatus", () => {
-		it("creates prepare info and sets only the native platform status when there isn't an existing prepare info", () => {
+		it("creates prepare info and sets only the native platform status when there isn't an existing prepare info", async () => {
 			for (const platform of ["ios", "android"]) {
-				serviceTest.projectChangesService.setNativePlatformStatus(serviceTest.getPlatformData(platform), { nativePlatformStatus: Constants.NativePlatformStatus.requiresPrepare });
+				await serviceTest.projectChangesService.setNativePlatformStatus(serviceTest.getPlatformData(platform), serviceTest.projectData, { nativePlatformStatus: Constants.NativePlatformStatus.requiresPrepare });
 
 				const actualPrepareInfo = serviceTest.projectChangesService.getPrepareInfo(serviceTest.getPlatformData(platform));
 
@@ -183,10 +183,10 @@ describe("Project Changes Service Tests", () => {
 		it(`shouldn't reset prepare info when native platform status is ${Constants.NativePlatformStatus.alreadyPrepared} and there is existing prepare info`, async () => {
 			for (const platform of ["ios", "android"]) {
 				await serviceTest.projectChangesService.checkForChanges(serviceTest.getPlatformData(platform), serviceTest.projectData, <any>{});
-				serviceTest.projectChangesService.savePrepareInfo(serviceTest.getPlatformData(platform));
+				await serviceTest.projectChangesService.savePrepareInfo(serviceTest.getPlatformData(platform), serviceTest.projectData, null);
 				const prepareInfo = serviceTest.projectChangesService.getPrepareInfo(serviceTest.getPlatformData(platform));
 
-				serviceTest.projectChangesService.setNativePlatformStatus(serviceTest.getPlatformData(platform), { nativePlatformStatus: Constants.NativePlatformStatus.alreadyPrepared });
+				await serviceTest.projectChangesService.setNativePlatformStatus(serviceTest.getPlatformData(platform), serviceTest.projectData, { nativePlatformStatus: Constants.NativePlatformStatus.alreadyPrepared });
 
 				const actualPrepareInfo = serviceTest.projectChangesService.getPrepareInfo(serviceTest.getPlatformData(platform));
 				prepareInfo.nativePlatformStatus = Constants.NativePlatformStatus.alreadyPrepared;
@@ -198,7 +198,7 @@ describe("Project Changes Service Tests", () => {
 			it(`should reset prepare info when native platform status is ${nativePlatformStatus} and there is existing prepare info`, async () => {
 				for (const platform of ["ios", "android"]) {
 					await serviceTest.projectChangesService.checkForChanges(serviceTest.getPlatformData(platform), serviceTest.projectData, <any>{});
-					serviceTest.projectChangesService.setNativePlatformStatus(serviceTest.getPlatformData(platform), { nativePlatformStatus: nativePlatformStatus });
+					await serviceTest.projectChangesService.setNativePlatformStatus(serviceTest.getPlatformData(platform), serviceTest.projectData, { nativePlatformStatus: nativePlatformStatus });
 
 					const actualPrepareInfo = serviceTest.projectChangesService.getPrepareInfo(serviceTest.getPlatformData(platform));
 					assert.deepEqual(actualPrepareInfo, { nativePlatformStatus: nativePlatformStatus });
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -749,7 +749,7 @@ export class ProjectChangesService implements IProjectChangesService {
 		return null;
 	}
 
-	public savePrepareInfo(platformData: IPlatformData): void {
+	public async savePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<void> {
 	}
 
 	public getPrepareInfoFilePath(platformData: IPlatformData): string {
@@ -760,7 +760,7 @@ export class ProjectChangesService implements IProjectChangesService {
 		return <IProjectChangesInfo>{};
 	}
 
-	public setNativePlatformStatus(platformData: IPlatformData, addedPlatform: IAddedNativePlatform): void {
+	public async setNativePlatformStatus(platformData: IPlatformData, projectData: IProjectData, addedPlatform: IAddedNativePlatform): Promise<void> {
 		return;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export class PrepareController extends EventEmitter {`
`47`	`47`	`result = { hasNativeChanges, platform: prepareData.platform.toLowerCase() };`
`48`	`48`	`}`
`49`	`49`
`50`		`- this.$projectChangesService.savePrepareInfo(platformData);`
	`50`	`+ await this.$projectChangesService.savePrepareInfo(platformData, projectData, prepareData);`
`51`	`51`
`52`	`52`	this.$logger.info(`Project successfully prepared (${prepareData.platform.toLowerCase()})`);
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export class AddPlatformService implements IAddPlatformService {`
`61`	`61`	`platformData.platformProjectService.ensureConfigurationFileInAppResources(projectData);`
`62`	`62`	`await platformData.platformProjectService.interpolateData(projectData);`
`63`	`63`	`platformData.platformProjectService.afterCreateProject(platformData.projectRoot, projectData);`
`64`		`- this.$projectChangesService.setNativePlatformStatus(platformData, { nativePlatformStatus: NativePlatformStatus.requiresPrepare });`
	`64`	`+ await this.$projectChangesService.setNativePlatformStatus(platformData, projectData, { nativePlatformStatus: NativePlatformStatus.requiresPrepare });`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`$injector.register("addPlatformService", AddPlatformService);`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export class PrepareNativePlatformService implements IPrepareNativePlatformServi`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`platformData.platformProjectService.interpolateConfigurationFile(projectData);`
`50`		`- this.$projectChangesService.setNativePlatformStatus(platformData, { nativePlatformStatus: NativePlatformStatus.alreadyPrepared });`
	`50`	`+ await this.$projectChangesService.setNativePlatformStatus(platformData, projectData, { nativePlatformStatus: NativePlatformStatus.alreadyPrepared });`
`51`	`51`
`52`	`52`	`return hasChanges;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,16 @@ export class ProjectChangesService implements IProjectChangesService {`
`136`	`136`	`return prepareInfo;`
`137`	`137`	`}`
`138`	`138`
`139`		`- public savePrepareInfo(platformData: IPlatformData): void {`
	`139`	`+ public async savePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<void> {`
	`140`	`+ if (!this._prepareInfo) {`
	`141`	`+ await this.ensurePrepareInfo(platformData, projectData, prepareData);`
	`142`	`+ }`
	`143`	`+`
`140`	`144`	`const prepareInfoFilePath = this.getPrepareInfoFilePath(platformData);`
`141`	`145`	`this.$fs.writeJson(prepareInfoFilePath, this._prepareInfo);`
`142`	`146`	`}`
`143`	`147`
`144`		`- public setNativePlatformStatus(platformData: IPlatformData, addedPlatform: IAddedNativePlatform): void {`
	`148`	`+ public async setNativePlatformStatus(platformData: IPlatformData, projectData: IProjectData, addedPlatform: IAddedNativePlatform): Promise<void> {`
`145`	`149`	`this._prepareInfo = this._prepareInfo \|\| this.getPrepareInfo(platformData);`
`146`	`150`	`if (this._prepareInfo && addedPlatform.nativePlatformStatus === NativePlatformStatus.alreadyPrepared) {`
`147`	`151`	`this._prepareInfo.nativePlatformStatus = addedPlatform.nativePlatformStatus;`
`@@ -151,7 +155,7 @@ export class ProjectChangesService implements IProjectChangesService {`
`151`	`155`	`};`
`152`	`156`	`}`
`153`	`157`
`154`		`- this.savePrepareInfo(platformData);`
	`158`	`+ await this.savePrepareInfo(platformData, projectData, null);`
`155`	`159`	`}`
`156`	`160`
`157`	`161`	`private async ensurePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: PrepareData): Promise<boolean> {`
Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ export class ProjectChangesService implements IProjectChangesService {`
`749`	`749`	`return null;`
`750`	`750`	`}`
`751`	`751`
`752`		`- public savePrepareInfo(platformData: IPlatformData): void {`
	`752`	`+ public async savePrepareInfo(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<void> {`
`753`	`753`	`}`
`754`	`754`
`755`	`755`	`public getPrepareInfoFilePath(platformData: IPlatformData): string {`
`@@ -760,7 +760,7 @@ export class ProjectChangesService implements IProjectChangesService {`
`760`	`760`	`return <IProjectChangesInfo>{};`
`761`	`761`	`}`
`762`	`762`
`763`		`- public setNativePlatformStatus(platformData: IPlatformData, addedPlatform: IAddedNativePlatform): void {`
	`763`	`+ public async setNativePlatformStatus(platformData: IPlatformData, projectData: IProjectData, addedPlatform: IAddedNativePlatform): Promise<void> {`
`764`	`764`	`return;`
`765`	`765`	`}`
`766`	`766`	`}`