Merge pull request EddyVerbruggen#72 from rosen-vladimirov/vladimirov/prepare-for-6.0-release

fix: make plugin hooks compatible with CLI 6.0.0

Author: EddyVerbruggen

src/hooks/before-checkForChanges.ts

@@ -6,18 +6,19 @@ import { DataProvider } from "./data.provider";
 export = function(
  androidResourcesMigrationService: IAndroidResourcesMigrationService,
  logger: ILogger,
- platformsData: IPlatformsData,
  projectData: IProjectData,
+ injector: IInjector,
  hookArgs: any
 ) {
- const platformName = hookArgs.checkForChangesOpts.platform.toLowerCase();
 
- if (hookArgs.checkForChangesOpts.projectData) {
- projectData = hookArgs.checkForChangesOpts.projectData;
- }
+ const platformName = (hookArgs &&
+ (hookArgs.platformData && hookArgs.platformData.normalizedPlatformName) ||
+ (hookArgs.checkForChangesOpts && hookArgs.checkForChangesOpts.platform) ||
+ '').toLowerCase();
 
- const platformData = platformsData.getPlatformData(platformName, projectData);
+ projectData = hookArgs && (hookArgs.projectData || (hookArgs.checkForChangesOpts && hookArgs.checkForChangesOpts.projectData));
 
+ const platformData = getPlatformData(hookArgs && hookArgs.platformData, projectData, platformName, injector);
  let converter: ConverterCommon;
  const dataProvider = new DataProvider(logger, projectData);
 
@@ -32,3 +33,13 @@ export = function(
 
  converter.run();
 };
+
+function getPlatformData(platformData: IPlatformData, projectData: IProjectData, platform: string, injector: IInjector): IPlatformData {
+ if (!platformData) {
+ // Used in CLI 5.4.x and below:
+ const platformsData = injector.resolve<IPlatformsData>("platformsData");
+ platformData = platformsData.getPlatformData(platform, projectData);
+ }
+
+ return platformData;
+}

src/typings/nativescript.d.ts

@@ -5,33 +5,27 @@ interface IAndroidResourcesMigrationService {
 }
 
 interface ILogger {
- setLevel(level: string): void;
+ initialize(opts?: any): void;
+ initializeCliLogger(): void;
  getLevel(): string;
  fatal(formatStr?: any, ...args: any[]): void;
  error(formatStr?: any, ...args: any[]): void;
  warn(formatStr?: any, ...args: any[]): void;
- warnWithLabel(formatStr?: any, ...args: any[]): void;
  info(formatStr?: any, ...args: any[]): void;
  debug(formatStr?: any, ...args: any[]): void;
  trace(formatStr?: any, ...args: any[]): void;
  printMarkdown(...args: any[]): void;
- out(formatStr?: any, ...args: any[]): void;
- write(...args: any[]): void;
  prepare(item: any): string;
- printInfoMessageOnSameLine(message: string): void;
- printMsgWithTimeout(message: string, timeout: number): Promise<void>;
+ isVerbose(): boolean;
 }
 
 interface IPlatformData {
  frameworkPackageName: string;
  platformProjectService: IPlatformProjectService;
  projectRoot: string;
  normalizedPlatformName: string;
+ platformNameLowerCase: string;
  appDestinationDirectoryPath: string;
- deviceBuildOutputPath: string;
- emulatorBuildOutputPath?: string;
- validPackageNamesForDevice: string[];
- validPackageNamesForEmulator?: string[];
  frameworkFilesExtensions: string[];
  frameworkDirectoriesExtensions?: string[];
  frameworkDirectoriesNames?: string[];
@@ -73,3 +67,11 @@ interface IProjectData {
  getAppResourcesDirectoryPath(projectDir?: string): string;
  getAppResourcesRelativeDirectoryPath(): string;
 }
+
+interface IPlatformsDataService {
+ getPlatformData(platform: string, projectData: IProjectData): IPlatformData;
+}
+
+interface IInjector {
+ resolve<T>(name: string, ctorArguments?: any): any;
+}