Merge pull request #2100 from NativeScript/hdeshev/no-broccoli

Kill all references to broccoli.

Author: hdeshev

lib/bootstrap.ts

@@ -73,9 +73,7 @@ $injector.require("deviceLogProvider", "./common/mobile/device-log-provider");
 $injector.require("liveSyncProvider", "./providers/livesync-provider");
 $injector.require("projectFilesProvider", "./providers/project-files-provider");
 
-$injector.require("broccoliBuilder", "./tools/broccoli/builder");
-$injector.require("nodeModulesTree", "./tools/broccoli/trees/node-modules-tree");
-$injector.require("broccoliPluginWrapper", "./tools/broccoli/broccoli-plugin-wrapper");
+$injector.require("nodeModulesBuilder", "./tools/node-modules/node-modules-builder");
 
 $injector.require("pluginVariablesService", "./services/plugin-variables-service");
 $injector.require("pluginsService", "./services/plugins-service");

lib/definitions/platform.d.ts

@@ -52,3 +52,7 @@ interface IPlatformsData {
 	getPlatformData(platform: string): IPlatformData;
 }
 
+interface INodeModulesBuilder {
+	prepareNodeModules(absoluteOutputPath: string, platform: string, lastModifiedTime: Date): IFuture<void>;
+	cleanNodeModules(absoluteOutputPath: string, platform: string): void;
+}

lib/services/platform-service.ts

@@ -23,7 +23,7 @@ export class PlatformService implements IPlatformService {
 		private $hooksService: IHooksService,
 		private $commandsService: ICommandsService,
 		private $options: IOptions,
-		private $broccoliBuilder: IBroccoliBuilder,
+		private $nodeModulesBuilder: INodeModulesBuilder,
 		private $pluginsService: IPluginsService,
 		private $projectFilesManager: IProjectFilesManager,
 		private $mobileHelper: Mobile.IMobileHelper,
@@ -298,10 +298,10 @@ export class PlatformService implements IPlatformService {
 				let tnsModulesDestinationPath = path.join(appDir, constants.TNS_MODULES_FOLDER_NAME);
 				if (!this.$options.bundle) {
 					// Process node_modules folder
-					this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, platform, lastModifiedTime).wait();
+					this.$nodeModulesBuilder.prepareNodeModules(tnsModulesDestinationPath, platform, lastModifiedTime).wait();
 				} else {
 					// Clean target node_modules folder. Not needed when bundling.
-					this.$broccoliBuilder.cleanNodeModules(tnsModulesDestinationPath, platform);
+					this.$nodeModulesBuilder.cleanNodeModules(tnsModulesDestinationPath, platform);
 				}
 			} catch (error) {
 				this.$logger.debug(error);

lib/services/plugins-service.ts

@@ -24,9 +24,6 @@ export class PluginsService implements IPluginsService {
 	private get $projectFilesManager(): IProjectFilesManager {
 		return this.$injector.resolve("projectFilesManager");
 	}
-	private get $broccoliBuilder(): IBroccoliBuilder {
-		return this.$injector.resolve("broccoliBuilder");
-	}
 
 	constructor(private $npm: INodePackageManager,
 		private $fs: IFileSystem,

lib/tools/broccoli/broccoli-plugin-wrapper-factory.ts

@@ -9,10 +9,9 @@ import {sleep} from "../../../lib/common/helpers";
 
 let glob = require("glob");
 
-export class Builder implements IBroccoliBuilder {
+export class NodeModulesBuilder implements INodeModulesBuilder {
 	constructor(
 		private $fs: IFileSystem,
-		private $nodeModulesTree: INodeModulesTree,
 		private $projectData: IProjectData,
 		private $projectDataService: IProjectDataService,
 		private $injector: IInjector,
@@ -129,7 +128,7 @@ export class Builder implements IBroccoliBuilder {
 		});
 	}
 
-	public prepareNodeModules(absoluteOutputPath: string, platform: string, lastModifiedTime?: Date): IFuture<void> {
+	public prepareNodeModules(absoluteOutputPath: string, platform: string, lastModifiedTime: Date): IFuture<void> {
 		return (() => {
 			if (!fs.existsSync(absoluteOutputPath)) {
 				// Force copying if the destination doesn't exist.
@@ -153,4 +152,4 @@ export class Builder implements IBroccoliBuilder {
 		shelljs.rm("-rf", absoluteOutputPath);
     }
 }
-$injector.register("broccoliBuilder", Builder);
+$injector.register("nodeModulesBuilder", NodeModulesBuilder);