WIP

Author: Fatme

.vscode/launch.json

@@ -15,7 +15,7 @@
 			"program": "${workspaceRoot}/lib/nativescript-cli.js",
 
 			// example commands
-			"args": [ "create", "cliapp", "--path", "${workspaceRoot}/scratch"]
+			"args": [ "run", "ios", "--path", "${workspaceRoot}/scratch/webpackApp", "--bundle"]
 			// "args": [ "test", "android", "--justlaunch"]
 			// "args": [ "platform", "add", "android@1.3.0", "--path", "cliapp"]
 			// "args": [ "platform", "remove", "android", "--path", "cliapp"]

lib/bootstrap.ts

@@ -201,3 +201,5 @@ $injector.require("testInitializationService", "./services/test-initialization-s
 
 $injector.require("networkConnectivityValidator", "./helpers/network-connectivity-validator");
 $injector.requirePublic("cleanupService", "./services/cleanup-service");
+
+$injector.require("webpackCompilerService", "./services/webpack/webpack-compiler-service");

lib/commands/appstore-upload.ts

@@ -65,7 +65,11 @@ export class PublishIOS implements ICommand {
 				appFilesUpdaterOptions,
 				projectData: this.$projectData,
 				config: this.$options,
-				env: this.$options.env
+				env: this.$options.env,
+				webpackCompilerConfig: {
+					watch: false,
+					env: this.$options.env
+				}
 			};
 			const buildConfig: IBuildConfig = {
 				projectDir: this.$options.path,

lib/commands/build.ts

@@ -26,7 +26,11 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 			appFilesUpdaterOptions,
 			projectData: this.$projectData,
 			config: this.$options,
-			env: this.$options.env
+			env: this.$options.env,
+			webpackCompilerConfig: {
+				watch: false,
+				env: this.$options.env
+			}
 		};
 
 		await this.$platformService.preparePlatform(platformInfo);

lib/commands/clean-app.ts

@@ -26,7 +26,11 @@ export class CleanAppCommandBase extends ValidatePlatformCommandBase implements
 			platform: this.platform.toLowerCase(),
 			config: this.$options,
 			projectData: this.$projectData,
-			env: this.$options.env
+			env: this.$options.env,
+			webpackCompilerConfig: {
+				watch: false,
+				env: this.$options.env
+			}
 		};
 
 		return this.$platformService.cleanDestinationApp(platformInfo);

lib/commands/prepare.ts

@@ -23,7 +23,11 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 			appFilesUpdaterOptions,
 			projectData: this.$projectData,
 			config: this.$options,
-			env: this.$options.env
+			env: this.$options.env,
+			webpackCompilerConfig: {
+				watch: false,
+				env: this.$options.env
+			}
 		};
 
 		await this.$platformService.preparePlatform(platformInfo);

lib/common/declarations.d.ts

@@ -1507,6 +1507,7 @@ interface IPromiseActions<T> {
 interface IDeferPromise<T> extends IPromiseActions<T> {
 	isRejected(): boolean;
 	isPending(): boolean;
+	getResult(): any;
 	promise: Promise<T>;
 }
 

lib/common/helpers.ts

@@ -130,10 +130,12 @@ export function deferPromise<T>(): IDeferPromise<T> {
 	let isResolved = false;
 	let isRejected = false;
 	let promise: Promise<T>;
+	let result: T | PromiseLike<T>;
 
 	promise = new Promise<T>((innerResolve, innerReject) => {
 		resolve = (value?: T | PromiseLike<T>) => {
 			isResolved = true;
+			result = value;
 
 			return innerResolve(value);
 		};
@@ -151,7 +153,8 @@ export function deferPromise<T>(): IDeferPromise<T> {
 		reject,
 		isResolved: () => isResolved,
 		isRejected: () => isRejected,
-		isPending: () => !isResolved && !isRejected
+		isPending: () => !isResolved && !isRejected,
+		getResult: () => result
 	};
 }
 

lib/definitions/platform.d.ts

@@ -307,11 +307,6 @@ interface IPlatformDataComposition {
 
 interface ICopyAppFilesData extends IProjectDataComposition, IAppFilesUpdaterOptionsComposition, IPlatformDataComposition, IOptionalFilesToSync, IOptionalFilesToRemove { }
 
-interface IPreparePlatformService {
-	addPlatform(info: IAddPlatformInfo): Promise<void>;
-	preparePlatform(config: IPreparePlatformJSInfo): Promise<void>;
-}
-
 interface IAddPlatformInfo extends IProjectDataComposition, IPlatformDataComposition {
 	frameworkDir: string;
 	installedVersion: string;
@@ -334,7 +329,9 @@ interface IPreparePlatformCoreInfo extends IPreparePlatformInfoBase, IOptionalPr
 	platformSpecificData: IPlatformSpecificData;
 }
 
-interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, ISkipNativeCheckOptional { }
+interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig, ISkipNativeCheckOptional {
+	webpackCompilerConfig: IWebpackCompilerConfig;
+}
 
 interface IPlatformConfig {
 	config: IPlatformOptions;

lib/definitions/project-changes.d.ts

@@ -13,13 +13,11 @@ interface IPrepareInfo extends IAddedNativePlatform, IAppFilesHashes {
 }
 
 interface IProjectChangesInfo extends IAddedNativePlatform {
-	appFilesChanged: boolean;
 	appResourcesChanged: boolean;
 	modulesChanged: boolean;
 	configChanged: boolean;
 	packageChanged: boolean;
 	nativeChanged: boolean;
-	bundleChanged: boolean;
 	signingChanged: boolean;
 
 	readonly hasChanges: boolean;