Merge pull request #4826 from NativeScript/vladimirov/fix-npm-install

fix: execute npm install before all hooks

Author: rosen-vladimirov

lib/controllers/prepare-controller.ts

@@ -22,17 +22,39 @@ export class PrepareController extends EventEmitter {
 		private $logger: ILogger,
 		private $nodeModulesDependenciesBuilder: INodeModulesDependenciesBuilder,
 		private $platformsDataService: IPlatformsDataService,
+		private $pluginsService: IPluginsService,
 		private $prepareNativePlatformService: IPrepareNativePlatformService,
 		private $projectChangesService: IProjectChangesService,
 		private $projectDataService: IProjectDataService,
 		private $webpackCompilerService: IWebpackCompilerService,
 		private $watchIgnoreListService: IWatchIgnoreListService
 	) { super(); }
 
-	@performanceLog()
-	@hook("prepare")
 	public async prepare(prepareData: IPrepareData): Promise<IPrepareResultData> {
 		const projectData = this.$projectDataService.getProjectData(prepareData.projectDir);
+
+		await this.$pluginsService.ensureAllDependenciesAreInstalled(projectData);
+
+		return this.prepareCore(prepareData, projectData);
+	}
+
+	public async stopWatchers(projectDir: string, platform: string): Promise<void> {
+		const platformLowerCase = platform.toLowerCase();
+
+		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher) {
+			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher.close();
+			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher = null;
+		}
+
+		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess) {
+			await this.$webpackCompilerService.stopWebpackCompiler(platform);
+			this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess = false;
+		}
+	}
+
+	@performanceLog()
+	@hook("prepare")
+	private async prepareCore(prepareData: IPrepareData, projectData: IProjectData): Promise<IPrepareResultData> {
 		this.$bundleValidatorHelper.validate(projectData, "1.0.0");
 
 		await this.$platformController.addPlatformIfNeeded(prepareData);
@@ -57,20 +79,6 @@ export class PrepareController extends EventEmitter {
 		return result;
 	}
 
-	public async stopWatchers(projectDir: string, platform: string): Promise<void> {
-		const platformLowerCase = platform.toLowerCase();
-
-		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher) {
-			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher.close();
-			this.watchersData[projectDir][platformLowerCase].nativeFilesWatcher = null;
-		}
-
-		if (this.watchersData && this.watchersData[projectDir] && this.watchersData[projectDir][platformLowerCase] && this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess) {
-			await this.$webpackCompilerService.stopWebpackCompiler(platform);
-			this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess = false;
-		}
-	}
-
 	@hook("watch")
 	private async startWatchersWithPrepare(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<IPrepareResultData> {
 		if (!this.watchersData[projectData.projectDir]) {

lib/services/webpack/webpack-compiler-service.ts

@@ -2,7 +2,6 @@ import * as path from "path";
 import * as child_process from "child_process";
 import { EventEmitter } from "events";
 import { performanceLog } from "../../common/decorators";
-import { hook } from "../../common/helpers";
 import { WEBPACK_COMPILATION_COMPLETE } from "../../constants";
 
 export class WebpackCompilerService extends EventEmitter implements IWebpackCompilerService {
@@ -13,7 +12,6 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 		public $hooksService: IHooksService,
 		public $hostInfo: IHostInfo,
 		private $logger: ILogger,
-		private $pluginsService: IPluginsService,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $cleanupService: ICleanupService
 	) { super(); }
@@ -129,13 +127,10 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 	}
 
 	@performanceLog()
-	@hook('prepareJSApp')
 	private async startWebpackProcess(platformData: IPlatformData, projectData: IProjectData, prepareData: IPrepareData): Promise<child_process.ChildProcess> {
 		const envData = this.buildEnvData(platformData.platformNameLowerCase, projectData, prepareData);
 		const envParams = this.buildEnvCommandLineParams(envData, platformData, prepareData);
 
-		await this.$pluginsService.ensureAllDependenciesAreInstalled(projectData);
-
 		const args = [
 			path.join(projectData.projectDir, "node_modules", "webpack", "bin", "webpack.js"),
 			"--preserve-symlinks",