feat: add env support to webpackCompilerService

Author: Fatme

.vscode/launch.json

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

lib/definitions/livesync.d.ts

@@ -141,8 +141,7 @@ declare global {
 	/**
 	 * Describes a LiveSync operation.
 	 */
-	interface ILiveSyncInfo extends IProjectDir, IRelease, IOptionalSkipWatcher, IHasUseHotModuleReloadOption, IHasSyncToPreviewAppOption {
-		webpackCompilerConfig: IWebpackCompilerConfig;
+	interface ILiveSyncInfo extends IProjectDir, IEnvOptions, IRelease, IOptionalSkipWatcher, IHasUseHotModuleReloadOption, IHasSyncToPreviewAppOption {
 		emulator?: boolean;
 
 		/**

lib/definitions/platform.d.ts

@@ -106,10 +106,6 @@ interface IPreparePlatformJSInfo extends IPreparePlatformCoreInfo, ICopyAppFiles
 interface IPlatformOptions extends IRelease, IHasUseHotModuleReloadOption {
 }
 
-interface IShouldPrepareInfo extends IOptionalProjectChangesInfoComposition {
-	platformInfo: IPreparePlatformInfo;
-}
-
 interface IOptionalProjectChangesInfoComposition {
 	changesInfo?: IProjectChangesInfo;
 }
@@ -118,10 +114,6 @@ interface IPreparePlatformCoreInfo extends IPreparePlatformInfoBase, IOptionalPr
 	platformSpecificData: IPlatformSpecificData;
 }
 
-interface IPreparePlatformInfo extends IPreparePlatformInfoBase, IPlatformConfig {
-	webpackCompilerConfig: IWebpackCompilerConfig;
-}
-
 interface IPlatformConfig {
 	config: IPlatformOptions;
 }

lib/helpers/livesync-command-helper.ts

@@ -118,9 +118,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 			skipWatcher: !this.$options.watch,
 			clean: this.$options.clean,
 			release: this.$options.release,
-			webpackCompilerConfig: {
-				env: this.$options.env
-			},
+			env: this.$options.env,
 			timeout: this.$options.timeout,
 			useHotModuleReload: this.$options.hmr,
 			force: this.$options.force,

lib/services/platform/platform-watcher-service.ts

@@ -45,7 +45,6 @@ export class PlatformWatcherService extends EventEmitter implements IPlatformWat
 	private async startJSWatcherWithPrepare(platformData: IPlatformData, projectData: IProjectData, config: IWebpackCompilerConfig): Promise<void> {
 		if (!this.watchersData[projectData.projectDir][platformData.platformNameLowerCase].webpackCompilerProcess) {
 			this.$webpackCompilerService.on("webpackEmittedFiles", files => {
-				console.log("=============== WEBPACK EMITTED FILES ============");
 				this.emitFilesChangeEvent({ files, hasNativeChanges: false, platform: platformData.platformNameLowerCase });
 			});
 

lib/services/webpack/webpack-compiler-service.ts

@@ -6,7 +6,8 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 	private webpackProcesses: IDictionary<child_process.ChildProcess> = {};
 
 	constructor(
-		private $childProcess: IChildProcess
+		private $childProcess: IChildProcess,
+		private $projectData: IProjectData
 	) { super(); }
 
 	public async compileWithWatch(platformData: IPlatformData, projectData: IProjectData, config: IWebpackCompilerConfig): Promise<any> {
@@ -34,7 +35,6 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 					const files = message.emittedFiles
 						.filter((file: string) => file.indexOf("App_Resources") === -1)
 						.map((file: string) => path.join(platformData.appDestinationDirectoryPath, "app", file));
-					console.log("===================== BEFORE EMIT webpack files ", files);
 					this.emit("webpackEmittedFiles", files);
 				}
 			});
@@ -76,26 +76,72 @@ export class WebpackCompilerService extends EventEmitter implements IWebpackComp
 	}
 
 	private startWebpackProcess(platformData: IPlatformData, projectData: IProjectData, config: IWebpackCompilerConfig): child_process.ChildProcess {
+		const envData = this.buildEnvData(platformData.platformNameLowerCase, config.env);
+		const envParams = this.buildEnvCommandLineParams(envData);
+
 		const args = [
 			path.join(projectData.projectDir, "node_modules", "webpack", "bin", "webpack.js"),
 			"--preserve-symlinks",
 			`--config=${path.join(projectData.projectDir, "webpack.config.js")}`,
-			`--env.${platformData.normalizedPlatformName.toLowerCase()}`
-			// `--env.unitTesting`
+			...envParams
 		];
 
 		if (config.watch) {
 			args.push("--watch");
 		}
 
-		// TODO: provide env variables
-
 		const stdio = config.watch ? ["inherit", "inherit", "inherit", "ipc"] : "inherit";
 		const childProcess = this.$childProcess.spawn("node", args, { cwd: projectData.projectDir, stdio });
 
 		this.webpackProcesses[platformData.platformNameLowerCase] = childProcess;
 
 		return childProcess;
 	}
+
+	private buildEnvData(platform: string, env: any) {
+		const envData = Object.assign({},
+			env,
+			{ [platform.toLowerCase()]: true }
+		);
+
+		const appPath = this.$projectData.getAppDirectoryRelativePath();
+		const appResourcesPath = this.$projectData.getAppResourcesRelativeDirectoryPath();
+		Object.assign(envData,
+			appPath && { appPath },
+			appResourcesPath && { appResourcesPath }
+		);
+
+		return envData;
+	}
+
+	private buildEnvCommandLineParams(envData: any) {
+		const envFlagNames = Object.keys(envData);
+		// const snapshotEnvIndex = envFlagNames.indexOf("snapshot");
+		// if (snapshotEnvIndex > -1 && !utils.shouldSnapshot(config)) {
+		// 	logSnapshotWarningMessage($logger);
+		// 	envFlagNames.splice(snapshotEnvIndex, 1);
+		// }
+
+		const args: any[] = [];
+		envFlagNames.map(item => {
+			let envValue = envData[item];
+			if (typeof envValue === "undefined") {
+				return;
+			}
+			if (typeof envValue === "boolean") {
+				if (envValue) {
+					args.push(`--env.${item}`);
+				}
+			} else {
+				if (!Array.isArray(envValue)) {
+					envValue = [envValue];
+				}
+
+				envValue.map((value: any) => args.push(`--env.${item}=${value}`))
+			}
+		});
+
+		return args;
+	}
 }
 $injector.register("webpackCompilerService", WebpackCompilerService);

lib/services/workflow/workflow-data-service.ts

@@ -1,4 +1,6 @@
 export type AddPlatformData = Pick<any, 'platformParam'> & Partial<Pick<IOptions, 'frameworkPath'>> & Partial<Pick<any, 'nativePrepare'>>;
+export type PreparePlatformData = Pick<any, 'nativePrepare'> & Pick<IOptions, 'env' | 'release'>;
+export type IOSPrepareData = PreparePlatformData & Pick<IOptions, 'teamId' | 'provision'> & Pick<any, 'mobileProvisionData'>;
 
 export class WorkflowDataService {
 	constructor(
@@ -15,7 +17,7 @@ export class WorkflowDataService {
 				projectData,
 				nativePlatformData,
 				addPlatformData: this.getAddPlatformData("ios", options),
-				preparePlatformData: new PreparePlatformData(options),
+				preparePlatformData: this.getIOSPrepareData(options),
 				buildPlatformData: new IOSBuildData(options),
 				deployPlatformData: new DeployPlatformData(options),
 				liveSyncData: {},
@@ -25,7 +27,7 @@ export class WorkflowDataService {
 				projectData,
 				nativePlatformData,
 				addPlatformData: this.getAddPlatformData("android", options),
-				preparePlatformData: new PreparePlatformData(options),
+				preparePlatformData: this.getPreparePlatformData(options),
 				buildPlatformData: new AndroidBuildData(options),
 				deployPlatformData: new DeployPlatformData(options),
 				liveSyncData: {},
@@ -43,6 +45,23 @@ export class WorkflowDataService {
 			platformParam: options.platformParam || platform,
 		};
 	}
+
+	private getPreparePlatformData(options: IOptions | any) {
+		return {
+			env: options.env,
+			release: options.release,
+			nativePrepare: options.nativePrepare
+		};
+	}
+
+	private getIOSPrepareData(options: IOptions | any) {
+		return {
+			...this.getPreparePlatformData(options),
+			teamId: options.teamId,
+			provision: options.provision,
+			mobileProvisionData: options.mobileProvisionData
+		};
+	}
 }
 $injector.register("workflowDataService", WorkflowDataService);
 
@@ -65,21 +84,21 @@ export class WorkflowData {
 // 	public nativePrepare = this.options.nativePrepare;
 // }
 
-export class PreparePlatformData {
-	constructor(protected options: IOptions | any) { }
+// export class PreparePlatformData {
+// 	constructor(protected options: IOptions | any) { }
 
-	public env = this.options.env;
-	public release = this.options.release;
-	public nativePrepare = this.options.nativePrepare;
-}
+// 	public env = this.options.env;
+// 	public release = this.options.release;
+// 	public nativePrepare = this.options.nativePrepare;
+// }
 
-export class IOSPrepareData extends PreparePlatformData {
-	constructor(options: IOptions | any) { super(options); }
+// export class IOSPrepareData extends PreparePlatformData {
+// 	constructor(options: IOptions | any) { super(options); }
 
-	public teamId = this.options.teamId;
-	public provision = this.options.provision;
-	public mobileProvisionData = this.options.mobileProvisionData;
-}
+// 	public teamId = this.options.teamId;
+// 	public provision = this.options.provision;
+// 	public mobileProvisionData = this.options.mobileProvisionData;
+// }
 
 export class BuildPlatformDataBase {
 	constructor(protected options: IOptions | any) { }

test/controllers/main-controller.ts

@@ -69,9 +69,7 @@ const liveSyncInfo = {
 	projectDir,
 	release: false,
 	useHotModuleReload: false,
-	webpackCompilerConfig: {
-		env: {},
-	}
+	env: {}
 };
 
 describe("MainController", () => {

test/tns-appstore-upload.ts

@@ -104,7 +104,7 @@ class AppStore {
 
 	expectPreparePlatform() {
 		this.expectedPreparePlatformCalls = 1;
-		this.platformService.preparePlatform = (platformInfo: IPreparePlatformInfo) => {
+		this.platformService.preparePlatform = (platformInfo: any) => {
 			chai.assert.equal(platformInfo.platform, "iOS");
 			this.preparePlatformCalls++;
 			return Promise.resolve(true);