Merge pull request #1671 from NativeScript/hdeshev/node_modules-bundle

Add a --bundle option that disables node_modules -> tns_modules update.

Author: hdeshev

lib/declarations.ts

@@ -80,6 +80,7 @@ interface IOptions extends ICommonOptions {
 	keyStorePath: string;
 	linkTo: string;
 	ng: boolean;
+	bundle: boolean;
 	platformTemplate: string;
 	port: Number;
 	production: boolean;

lib/options.ts

@@ -37,6 +37,7 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			baseConfig: { type: OptionType.String },
 			platformTemplate: { type: OptionType.String },
 			ng: {type: OptionType.Boolean },
+			bundle: {type: OptionType.Boolean },
 			all: {type: OptionType.Boolean }
 		},
 		path.join($hostInfo.isWindows ? process.env.AppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),

lib/services/platform-service.ts

@@ -280,11 +280,16 @@ export class PlatformService implements IPlatformService {
 
 			platformData.platformProjectService.prepareProject().wait();
 
-			// Process node_modules folder
 			let appDir = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 			try {
 				let tnsModulesDestinationPath = path.join(appDir, constants.TNS_MODULES_FOLDER_NAME);
-				this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, platform, lastModifiedTime).wait();
+				if (!this.$options.bundle) {
+					// Process node_modules folder
+					this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, platform, lastModifiedTime).wait();
+				} else {
+					// Clean target node_modules folder. Not needed when bundling.
+					this.$broccoliBuilder.cleanNodeModules(tnsModulesDestinationPath, platform);
+				}
 			} catch(error) {
 				this.$logger.debug(error);
 				shell.rm("-rf", appDir);

lib/tools/broccoli/broccoli.d.ts

@@ -154,6 +154,7 @@ interface BroccoliNode {
 interface IBroccoliBuilder {
    getChangedNodeModules(outputPath: string, platform: string, lastModifiedTime?: Date): IFuture<any>;
    prepareNodeModules(outputPath: string, platform: string, lastModifiedTime?: Date): IFuture<void>;
+   cleanNodeModules(outputPath: string, platform: string): void;
 }
 
 interface IDiffResult {
@@ -169,4 +170,4 @@ interface IBroccoliPlugin {
 
 interface INodeModulesTree {
    makeNodeModulesTree(absoluteOutputPath: string, projectDir: string): any;
-}
+}

lib/tools/broccoli/builder.ts

@@ -2,7 +2,9 @@
 "use strict";
 
 import * as constants from "../../../lib/constants";
+import * as fs from "fs";
 import * as path from "path";
+import * as shelljs from "shelljs";
 import Future = require("fibers/future");
 import * as destCopyLib from "./node-modules-dest-copy";
 import * as fiberBootstrap from "../../common/fiber-bootstrap";
@@ -112,6 +114,10 @@ export class Builder implements IBroccoliBuilder {
 
 	public prepareNodeModules(absoluteOutputPath: string, platform: string, lastModifiedTime?: Date): IFuture<void> {
 		return (() => {
+			if (!fs.existsSync(absoluteOutputPath)) {
+				// Force copying if the destination doesn't exist.
+				lastModifiedTime = null;
+			}
 			let nodeModules = this.getChangedNodeModules(absoluteOutputPath, platform, lastModifiedTime).wait();
 			let destCopy = this.$injector.resolve(destCopyLib.DestCopy, {
 				inputPath: this.$projectData.projectDir,
@@ -125,5 +131,9 @@ export class Builder implements IBroccoliBuilder {
 
 		}).future<void>()();
 	}
+
+	public cleanNodeModules(absoluteOutputPath: string, platform: string): void {
+		shelljs.rm("-rf", absoluteOutputPath);
+    }
 }
 $injector.register("broccoliBuilder", Builder);

test/npm-support.ts

@@ -232,6 +232,28 @@ describe("Npm support tests", () => {
 		let scopedDependencyPath = path.join(tnsModulesFolderPath, "@reactivex", "rxjs");
 		assert.isTrue(fs.exists(scopedDependencyPath).wait());
 	});
+
+	it("Ensures that tns_modules absent when bundling", () => {
+		let fs = testInjector.resolve("fs");
+		let options = testInjector.resolve("options");
+		let tnsModulesFolderPath = path.join(appDestinationFolderPath, "app", "tns_modules");
+
+		try {
+			options.bundle = false;
+			preparePlatform(testInjector).wait();
+			assert.isTrue(fs.exists(tnsModulesFolderPath).wait(), "tns_modules created first");
+
+			options.bundle = true;
+			preparePlatform(testInjector).wait();
+			assert.isFalse(fs.exists(tnsModulesFolderPath).wait(), "tns_modules deleted when bundling");
+
+			options.bundle = false;
+			preparePlatform(testInjector).wait();
+			assert.isTrue(fs.exists(tnsModulesFolderPath).wait(), "tns_modules recreated");
+		} finally {
+			options.bundle = false;
+		}
+	});
 });
 
 describe("Flatten npm modules tests", () => {