Merge pull request #4011 from NativeScript/vladimirov/improve-prepare

fix: prepare node_modules only once
NativeScript · Oct 10, 2018 · 0b5d097 · 0b5d097
2 parents 2b5416c + 27b61e8
commit 0b5d097
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -309,6 +309,7 @@ interface INodeModulesData extends IPlatform, IProjectDataComposition, IAppFiles
 interface INodeModulesBuilderData {
 	nodeModulesData: INodeModulesData;
 	release: boolean;
+	copyNodeModules?: boolean;
 }
 
 interface INodeModulesBuilder {

diff --git a/lib/services/prepare-platform-js-service.ts b/lib/services/prepare-platform-js-service.ts
@@ -109,7 +109,8 @@ export class PreparePlatformJSService extends PreparePlatformService implements
 					appFilesUpdaterOptions,
 					projectFilesConfig
 				},
-				release: appFilesUpdaterOptions.release
+				release: appFilesUpdaterOptions.release,
+				copyNodeModules: true
 			});
 		} catch (error) {
 			this.$logger.debug(error);

diff --git a/lib/tools/node-modules/node-modules-builder.ts b/lib/tools/node-modules/node-modules-builder.ts
@@ -8,24 +8,33 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 	) { }
 
 	public async prepareNodeModules(opts: INodeModulesBuilderData): Promise<void> {
-		const productionDependencies = this.initialPrepareNodeModules(opts);
+		const productionDependencies = this.intialPrepareNodeModulesIfRequired(opts);
 		const npmPluginPrepare: NpmPluginPrepare = this.$injector.resolve(NpmPluginPrepare);
 		await npmPluginPrepare.preparePlugins(productionDependencies, opts.nodeModulesData.platform, opts.nodeModulesData.projectData, opts.nodeModulesData.projectFilesConfig);
 	}
 
 	public async prepareJSNodeModules(opts: INodeModulesBuilderData): Promise<void> {
-		const productionDependencies = this.initialPrepareNodeModules(opts);
+		const productionDependencies = this.intialPrepareNodeModulesIfRequired(opts);
 		const npmPluginPrepare: NpmPluginPrepare = this.$injector.resolve(NpmPluginPrepare);
 		await npmPluginPrepare.prepareJSPlugins(productionDependencies, opts.nodeModulesData.platform, opts.nodeModulesData.projectData, opts.nodeModulesData.projectFilesConfig);
 	}
 
+	private intialPrepareNodeModulesIfRequired(opts: INodeModulesBuilderData): IDependencyData[] {
+		const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(opts.nodeModulesData.projectData.projectDir);
+
+		if (opts.copyNodeModules) {
+			this.initialPrepareNodeModules(opts, productionDependencies);
+		}
+
+		return productionDependencies;
+	}
+
 	public cleanNodeModules(absoluteOutputPath: string): void {
 		shelljs.rm("-rf", absoluteOutputPath);
 	}
 
-	private initialPrepareNodeModules(opts: INodeModulesBuilderData): IDependencyData[] {
+	private initialPrepareNodeModules(opts: INodeModulesBuilderData, productionDependencies: IDependencyData[]): IDependencyData[] {
 		const { nodeModulesData, release } = opts;
-		const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(nodeModulesData.projectData.projectDir);
 
 		if (!this.$fs.exists(nodeModulesData.absoluteOutputPath)) {
 			// Force copying if the destination doesn't exist.
@@ -36,7 +45,7 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 			const tnsModulesCopy: TnsModulesCopy = this.$injector.resolve(TnsModulesCopy, {
 				outputRoot: nodeModulesData.absoluteOutputPath
 			});
-			tnsModulesCopy.copyModules({ dependencies: productionDependencies, release});
+			tnsModulesCopy.copyModules({ dependencies: productionDependencies, release });
 		} else {
 			this.cleanNodeModules(nodeModulesData.absoluteOutputPath);
 		}