Skip to content

Commit a2952bc

Browse files
committed
chore: fix PR comments
1 parent 8b65d78 commit a2952bc

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

lib/definitions/plugins.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ interface IPluginsService {
1515
validate(platformData: IPlatformData, projectData: IProjectData): Promise<void>;
1616
preparePluginNativeCode(pluginData: IPluginData, platform: string, projectData: IProjectData): Promise<void>;
1717
convertToPluginData(cacheData: any, projectDir: string): IPluginData;
18+
isNativeScriptPlugin(pluginName: string, projectData: IProjectData): boolean;
1819
}
1920

2021
interface IPackageJsonDepedenciesResult {

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

+4-8
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import * as util from "util";
44
import { Device } from "nativescript-preview-sdk";
55
import { PluginComparisonMessages } from "./preview-app-constants";
66
import { NODE_MODULES_DIR_NAME } from "../../../common/constants";
7+
import { PLATFORMS_DIR_NAME } from "../../../constants";
78

89
export class PreviewAppPluginsService implements IPreviewAppPluginsService {
910
private previewAppVersionWarnings: IDictionary<string[]> = {};
1011

1112
constructor(private $fs: IFileSystem,
1213
private $logger: ILogger,
14+
private $pluginsService: IPluginsService,
1315
private $projectData: IProjectData) { }
1416

1517
public async comparePluginsOnDevice(data: IPreviewAppLiveSyncData, device: Device): Promise<void> {
@@ -91,17 +93,11 @@ export class PreviewAppPluginsService implements IPreviewAppPluginsService {
9193
}
9294

9395
private isNativeScriptPluginWithoutNativeCode(localPlugin: string, platform: string): boolean {
94-
return this.isNativeScriptPlugin(localPlugin) && !this.hasNativeCode(localPlugin, platform);
95-
}
96-
97-
private isNativeScriptPlugin(localPlugin: string): boolean {
98-
const pluginPackageJsonPath = path.join(this.$projectData.projectDir, NODE_MODULES_DIR_NAME, localPlugin, "package.json");
99-
const pluginPackageJsonContent = this.$fs.readJson(pluginPackageJsonPath);
100-
return pluginPackageJsonContent && pluginPackageJsonContent.nativescript;
96+
return this.$pluginsService.isNativeScriptPlugin(localPlugin, this.$projectData) && !this.hasNativeCode(localPlugin, platform);
10197
}
10298

10399
private hasNativeCode(localPlugin: string, platform: string): boolean {
104-
const nativeFolderPath = path.join(this.$projectData.projectDir, NODE_MODULES_DIR_NAME, localPlugin, "platforms", platform.toLowerCase());
100+
const nativeFolderPath = path.join(this.$projectData.projectDir, NODE_MODULES_DIR_NAME, localPlugin, PLATFORMS_DIR_NAME, platform.toLowerCase());
105101
return this.$fs.exists(nativeFolderPath) && !this.$fs.isEmptyDir(nativeFolderPath);
106102
}
107103
}

lib/services/plugins-service.ts

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as path from "path";
22
import * as shelljs from "shelljs";
33
import * as semver from "semver";
44
import * as constants from "../constants";
5+
import { NODE_MODULES_DIR_NAME } from "../common/constants";
56

67
export class PluginsService implements IPluginsService {
78
private static INSTALL_COMMAND_NAME = "install";
@@ -207,6 +208,12 @@ export class PluginsService implements IPluginsService {
207208
};
208209
}
209210

211+
public isNativeScriptPlugin(pluginName: string, projectData: IProjectData): boolean {
212+
const pluginPackageJsonPath = path.join(projectData.projectDir, NODE_MODULES_DIR_NAME, pluginName, "package.json");
213+
const pluginPackageJsonContent = this.$fs.readJson(pluginPackageJsonPath);
214+
return pluginPackageJsonContent && pluginPackageJsonContent.nativescript;
215+
}
216+
210217
private getBasicPluginInformation(dependencies: any): IBasePluginData[] {
211218
return _.map(dependencies, (version: string, key: string) => ({
212219
name: key,

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

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ function createTestInjector(localPlugins: IStringDictionary, options?: { isNativ
3434
return !options.hasPluginNativeCode;
3535
}
3636
});
37+
injector.register("pluginsService", {
38+
isNativeScriptPlugin: () => {
39+
return options.isNativeScriptPlugin;
40+
}
41+
});
3742
injector.register("logger", {
3843
trace: () => ({}),
3944
warn: (message: string) => warnParams.push(message)

0 commit comments

Comments
 (0)