Merge pull request #4711 from NativeScript/fatme/fix-plugin-workflow

fix: fix plugin's development workflow

Author: Fatme

lib/controllers/prepare-controller.ts

@@ -4,7 +4,7 @@ import { hook } from "../common/helpers";
 import { performanceLog } from "../common/decorators";
 import { EventEmitter } from "events";
 import * as path from "path";
-import { PREPARE_READY_EVENT_NAME, WEBPACK_COMPILATION_COMPLETE, PACKAGE_JSON_FILE_NAME } from "../constants";
+import { PREPARE_READY_EVENT_NAME, WEBPACK_COMPILATION_COMPLETE, PACKAGE_JSON_FILE_NAME, PLATFORMS_DIR_NAME } from "../constants";
 
 interface IPlatformWatcherData {
 	webpackCompilerProcess: child_process.ChildProcess;
@@ -20,6 +20,7 @@ export class PrepareController extends EventEmitter {
 		private $platformController: IPlatformController,
 		public $hooksService: IHooksService,
 		private $logger: ILogger,
+		private $nodeModulesDependenciesBuilder: INodeModulesDependenciesBuilder,
 		private $platformsDataService: IPlatformsDataService,
 		private $prepareNativePlatformService: IPrepareNativePlatformService,
 		private $projectChangesService: IProjectChangesService,
@@ -141,12 +142,15 @@ export class PrepareController extends EventEmitter {
 
 	@hook('watchPatterns')
 	public async getWatcherPatterns(platformData: IPlatformData, projectData: IProjectData): Promise<string[]> {
+		const pluginsNativeDirectories = this.$nodeModulesDependenciesBuilder.getProductionDependencies(projectData.projectDir)
+			.filter(dep => dep.nativescript)
+			.map(dep => path.join(dep.directory, PLATFORMS_DIR_NAME, platformData.platformNameLowerCase));
+
 		const patterns = [
 			path.join(projectData.projectDir, PACKAGE_JSON_FILE_NAME),
 			path.join(projectData.getAppDirectoryPath(), PACKAGE_JSON_FILE_NAME),
 			path.join(projectData.getAppResourcesRelativeDirectoryPath(), platformData.normalizedPlatformName),
-			`node_modules/**/platforms/${platformData.platformNameLowerCase}/`
-		];
+		].concat(pluginsNativeDirectories);
 
 		return patterns;
 	}

lib/controllers/run-controller.ts

@@ -302,9 +302,8 @@ export class RunController extends EventEmitter implements IRunController {
 
 			try {
 				if (data.hasNativeChanges) {
-					if (await this.$prepareNativePlatformService.prepareNativePlatform(platformData, projectData, prepareData)) {
-						await deviceDescriptor.buildAction();
-					}
+					await this.$prepareNativePlatformService.prepareNativePlatform(platformData, projectData, prepareData);
+					await deviceDescriptor.buildAction();
 				}
 
 				const isInHMRMode = liveSyncInfo.useHotModuleReload && data.hmrData && data.hmrData.hash;

test/controllers/prepare-controller.ts

@@ -45,6 +45,10 @@ function createTestInjector(data: { hasNativeChanges: boolean }): IInjector {
 
 	injector.register("prepareController", PrepareController);
 
+	injector.register("nodeModulesDependenciesBuilder", {
+		getProductionDependencies: () => (<any>[])
+	});
+
 	const prepareController: PrepareController = injector.resolve("prepareController");
 	prepareController.emit = (eventName: string, eventData: any) => {
 		emittedEventNames.push(eventName);