Merge pull request #3950 from NativeScript/fatme/remove-project-data

refactor: remove projectData from PreviewAppPluginsService in order to work from Sidekick

Author: Fatme

lib/definitions/plugins.d.ts

@@ -15,7 +15,7 @@ interface IPluginsService {
 	validate(platformData: IPlatformData, projectData: IProjectData): Promise<void>;
 	preparePluginNativeCode(pluginData: IPluginData, platform: string, projectData: IProjectData): Promise<void>;
 	convertToPluginData(cacheData: any, projectDir: string): IPluginData;
-	isNativeScriptPlugin(pluginName: string, projectData: IProjectData): boolean;
+	isNativeScriptPlugin(pluginPackageJsonPath: string): boolean;
 }
 
 interface IPackageJsonDepedenciesResult {

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

@@ -4,20 +4,19 @@ import * as util from "util";
 import { Device } from "nativescript-preview-sdk";
 import { PluginComparisonMessages } from "./preview-app-constants";
 import { NODE_MODULES_DIR_NAME } from "../../../common/constants";
-import { PLATFORMS_DIR_NAME } from "../../../constants";
+import { PLATFORMS_DIR_NAME, PACKAGE_JSON_FILE_NAME } from "../../../constants";
 
 export class PreviewAppPluginsService implements IPreviewAppPluginsService {
 	private previewAppVersionWarnings: IDictionary<string[]> = {};
 
 	constructor(private $fs: IFileSystem,
 		private $logger: ILogger,
-		private $pluginsService: IPluginsService,
-		private $projectData: IProjectData) { }
+		private $pluginsService: IPluginsService) { }
 
 	public async comparePluginsOnDevice(data: IPreviewAppLiveSyncData, device: Device): Promise<void> {
 		if (!this.previewAppVersionWarnings[device.previewAppVersion]) {
 			const devicePlugins = this.getDevicePlugins(device);
-			const localPlugins = this.getLocalPlugins();
+			const localPlugins = this.getLocalPlugins(data.projectDir);
 			const warnings = _.keys(localPlugins)
 				.map(localPlugin => {
 					const localPluginVersion = localPlugins[localPlugin];
@@ -55,8 +54,8 @@ export class PreviewAppPluginsService implements IPreviewAppPluginsService {
 		}
 	}
 
-	private getLocalPlugins(): IStringDictionary {
-		const projectFilePath = path.join(this.$projectData.projectDir, "package.json");
+	private getLocalPlugins(projectDir: string): IStringDictionary {
+		const projectFilePath = path.join(projectDir, PACKAGE_JSON_FILE_NAME);
 		try {
 			return this.$fs.readJson(projectFilePath).dependencies;
 		} catch (err) {
@@ -66,7 +65,7 @@ export class PreviewAppPluginsService implements IPreviewAppPluginsService {
 	}
 
 	private getWarningForPlugin(data: IPreviewAppLiveSyncData, localPlugin: string, localPluginVersion: string, devicePluginVersion: string, device: Device): string {
-		if (data && data.appFilesUpdaterOptions && data.appFilesUpdaterOptions.bundle && this.isNativeScriptPluginWithoutNativeCode(localPlugin, device.platform)) {
+		if (data && data.appFilesUpdaterOptions && data.appFilesUpdaterOptions.bundle && this.isNativeScriptPluginWithoutNativeCode(localPlugin, device.platform, data.projectDir)) {
 			return null;
 		}
 
@@ -92,12 +91,13 @@ export class PreviewAppPluginsService implements IPreviewAppPluginsService {
 		return util.format(PluginComparisonMessages.PLUGIN_NOT_INCLUDED_IN_PREVIEW_APP, localPlugin, deviceId);
 	}
 
-	private isNativeScriptPluginWithoutNativeCode(localPlugin: string, platform: string): boolean {
-		return this.$pluginsService.isNativeScriptPlugin(localPlugin, this.$projectData) && !this.hasNativeCode(localPlugin, platform);
+	private isNativeScriptPluginWithoutNativeCode(localPlugin: string, platform: string, projectDir: string): boolean {
+		const pluginPackageJsonPath = path.join(projectDir, NODE_MODULES_DIR_NAME, localPlugin, PACKAGE_JSON_FILE_NAME);
+		return this.$pluginsService.isNativeScriptPlugin(pluginPackageJsonPath) && !this.hasNativeCode(localPlugin, platform, projectDir);
 	}
 
-	private hasNativeCode(localPlugin: string, platform: string): boolean {
-		const nativeFolderPath = path.join(this.$projectData.projectDir, NODE_MODULES_DIR_NAME, localPlugin, PLATFORMS_DIR_NAME, platform.toLowerCase());
+	private hasNativeCode(localPlugin: string, platform: string, projectDir: string): boolean {
+		const nativeFolderPath = path.join(projectDir, NODE_MODULES_DIR_NAME, localPlugin, PLATFORMS_DIR_NAME, platform.toLowerCase());
 		return this.$fs.exists(nativeFolderPath) && !this.$fs.isEmptyDir(nativeFolderPath);
 	}
 }

lib/services/plugins-service.ts

@@ -2,7 +2,6 @@ import * as path from "path";
 import * as shelljs from "shelljs";
 import * as semver from "semver";
 import * as constants from "../constants";
-import { NODE_MODULES_DIR_NAME } from "../common/constants";
 
 export class PluginsService implements IPluginsService {
 	private static INSTALL_COMMAND_NAME = "install";
@@ -208,8 +207,7 @@ export class PluginsService implements IPluginsService {
 		};
 	}
 
-	public isNativeScriptPlugin(pluginName: string, projectData: IProjectData): boolean {
-		const pluginPackageJsonPath = path.join(projectData.projectDir, NODE_MODULES_DIR_NAME, pluginName, "package.json");
+	public isNativeScriptPlugin(pluginPackageJsonPath: string): boolean {
 		const pluginPackageJsonContent = this.$fs.readJson(pluginPackageJsonPath);
 		return pluginPackageJsonContent && pluginPackageJsonContent.nativescript;
 	}

lib/tools/node-modules/node-modules-dest-copy.ts

@@ -11,7 +11,8 @@ export class TnsModulesCopy {
 	constructor(
 		private outputRoot: string,
 		private $options: IOptions,
-		private $fs: IFileSystem
+		private $fs: IFileSystem,
+		private $pluginsService: IPluginsService
 	) {
 	}
 
@@ -67,9 +68,7 @@ export class TnsModulesCopy {
 					const pathToDependency = path.join(dependenciesFolder, d);
 					const pathToPackageJson = path.join(pathToDependency, constants.PACKAGE_JSON_FILE_NAME);
 
-					// TODO: Reuse pluginsService.isNativeScriptPlugin after making it work with full path.
-					const pluginPackageJsonContent = this.$fs.readJson(pathToPackageJson);
-					if (pluginPackageJsonContent && pluginPackageJsonContent.nativescript) {
+					if (this.$pluginsService.isNativeScriptPlugin(pathToPackageJson)) {
 						this.$fs.deleteDirectory(path.join(pathToDependency, constants.PLATFORMS_DIR_NAME));
 					}
 

test/services/playground/preview-app-plugins-service.ts

@@ -43,9 +43,6 @@ function createTestInjector(localPlugins: IStringDictionary, options?: { isNativ
 		trace: () => ({}),
 		warn: (message: string) =>  warnParams.push(message)
 	});
-	injector.register("projectData", {
-		projectDir
-	});
 	injector.register("previewAppPluginsService", PreviewAppPluginsService);
 	return injector;
 }
@@ -112,7 +109,7 @@ describe("previewAppPluginsService", () => {
 			const originalGetLocalPlugins = (<any>previewAppPluginsService).getLocalPlugins;
 			(<any>previewAppPluginsService).getLocalPlugins = () => {
 				isGetLocalPluginsCalled = true;
-				return originalGetLocalPlugins.apply(previewAppPluginsService);
+				return originalGetLocalPlugins.apply(previewAppPluginsService, [projectDir]);
 			};
 
 			const previewLiveSyncData = createPreviewLiveSyncData({ bundle: false });