Merge pull request NativeScript#4042 from NativeScript/fatme/merge-release

Fatme · web-flow · commit b7de231e5bc2 · 2018-10-19T12:17:51.000+03:00
Merge release branch into master
diff --git a/lib/tools/node-modules/node-modules-builder.ts b/lib/tools/node-modules/node-modules-builder.ts
@@ -20,10 +20,13 @@ export class NodeModulesBuilder implements INodeModulesBuilder {
 	}
 
 	private intialPrepareNodeModulesIfRequired(opts: INodeModulesBuilderData): IDependencyData[] {
-		const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(opts.nodeModulesData.projectData.projectDir);
+		const { nodeModulesData } = opts;
+		const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(nodeModulesData.projectData.projectDir);
 
 		if (opts.copyNodeModules) {
 			this.initialPrepareNodeModules(opts, productionDependencies);
+		} else if (nodeModulesData.appFilesUpdaterOptions.bundle) {
+			this.cleanNodeModules(nodeModulesData.absoluteOutputPath);
 		}
 
 		return productionDependencies;

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,13 @@ export class NodeModulesBuilder implements INodeModulesBuilder {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`private intialPrepareNodeModulesIfRequired(opts: INodeModulesBuilderData): IDependencyData[] {`
`23`		`- const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(opts.nodeModulesData.projectData.projectDir);`
	`23`	`+ const { nodeModulesData } = opts;`
	`24`	`+ const productionDependencies = this.$nodeModulesDependenciesBuilder.getProductionDependencies(nodeModulesData.projectData.projectDir);`
`24`	`25`
`25`	`26`	`if (opts.copyNodeModules) {`
`26`	`27`	`this.initialPrepareNodeModules(opts, productionDependencies);`
	`28`	`+ } else if (nodeModulesData.appFilesUpdaterOptions.bundle) {`
	`29`	`+ this.cleanNodeModules(nodeModulesData.absoluteOutputPath);`
`27`	`30`	`}`
`28`	`31`
`29`	`32`	`return productionDependencies;`