Merge pull request #4550 from NativeScript/feature/webpack-only

feat: support only webpack workflow

Author: Fatme

.travis.yml

@@ -3,6 +3,7 @@ branches:
     - master
     - release
     - release-patch
+    - feature/webpack-only
 env:
   global:
   - DATE=$(date +%Y-%m-%d)

.travis/add-publishConfig.js

@@ -26,6 +26,9 @@ switch (branch) {
 	case "master":
 		packageDef.publishConfig.tag = "next";
 		break;
+	case "feature/webpack-only":
+		packageDef.publishConfig.tag = "webpack";
+		break;
 	default:
 		throw new Error(`Unable to publish as the branch ${branch} does not have corresponding tag. Supported branches are master (next tag), release (rc tag) and release-patch (patch tag)`);
 }

PublicAPI.md

@@ -666,11 +666,6 @@ interface IDebugData {
 	 */
 	applicationIdentifier: string;
 
-	/**
-	 * Path to .app built for iOS Simulator.
-	 */
-	pathToAppPackage?: string;
-
 	/**
 	 * The name of the application, for example `MyProject`.
 	 */

docs/man_pages/project/creation/init.md

@@ -11,12 +11,20 @@ $injector.require("performanceService", "./services/performance-service");
 $injector.requirePublic("projectService", "./services/project-service");
 $injector.require("androidProjectService", "./services/android-project-service");
 $injector.require("androidPluginBuildService", "./services/android-plugin-build-service");
+$injector.require("gradleCommandService", "./services/android/gradle-command-service");
+$injector.require("gradleBuildService", "./services/android/gradle-build-service");
+$injector.require("gradleBuildArgsService", "./services/android/gradle-build-args-service");
 $injector.require("iOSEntitlementsService", "./services/ios-entitlements-service");
 $injector.require("iOSExtensionsService", "./services/ios-extensions-service");
 $injector.require("iOSWatchAppService", "./services/ios-watch-app-service");
 $injector.require("iOSProjectService", "./services/ios-project-service");
 $injector.require("iOSProvisionService", "./services/ios-provision-service");
 $injector.require("xcconfigService", "./services/xcconfig-service");
+$injector.require("iOSSigningService", "./services/ios/ios-signing-service");
+$injector.require("xcodebuildArgsService", "./services/ios/xcodebuild-args-service");
+$injector.require("xcodebuildCommandService", "./services/ios/xcodebuild-command-service");
+$injector.require("xcodebuildService", "./services/ios/xcodebuild-service");
+$injector.require("exportOptionsPlistService", "./services/ios/export-options-plist-service");
 
 $injector.require("cocoapodsService", "./services/cocoapods-service");
 $injector.require("cocoaPodsPlatformManager", "./services/cocoapods-platform-manager");
@@ -25,13 +33,31 @@ $injector.require("projectTemplatesService", "./services/project-templates-servi
 $injector.require("projectNameService", "./services/project-name-service");
 $injector.require("tnsModulesService", "./services/tns-modules-service");
 
-$injector.require("platformsData", "./platforms-data");
-$injector.require("platformService", "./services/platform-service");
-$injector.require("preparePlatformJSService", "./services/prepare-platform-js-service");
-$injector.require("preparePlatformNativeService", "./services/prepare-platform-native-service");
+$injector.require("platformsDataService", "./services/platforms-data-service");
+$injector.require("addPlatformService", "./services/platform/add-platform-service");
+$injector.require("buildInfoFileService", "./services/build-info-file-service");
+$injector.require("prepareNativePlatformService", "./services/platform/prepare-native-platform-service");
+$injector.require("platformValidationService", "./services/platform/platform-validation-service");
 
+$injector.require("buildArtefactsService", "./services/build-artefacts-service");
+
+$injector.require("deviceInstallAppService", "./services/device/device-install-app-service");
+
+$injector.require("platformController", "./controllers/platform-controller");
+$injector.require("prepareController", "./controllers/prepare-controller");
+$injector.require("deployController", "./controllers/deploy-controller");
+$injector.requirePublicClass("buildController", "./controllers/build-controller");
+$injector.requirePublicClass("runController", "./controllers/run-controller");
+$injector.requirePublicClass("debugController", "./controllers/debug-controller");
+$injector.requirePublicClass("previewAppController", "./controllers/preview-app-controller");
+
+$injector.require("prepareDataService", "./services/prepare-data-service");
+$injector.require("buildDataService", "./services/build-data-service");
+
+$injector.require("liveSyncServiceResolver", "./resolvers/livesync-service-resolver");
+
+$injector.require("liveSyncProcessDataService", "./services/livesync-process-data-service");
 $injector.require("debugDataService", "./services/debug-data-service");
-$injector.requirePublicClass("debugService", "./services/debug-service");
 $injector.require("iOSDeviceDebugService", "./services/ios-device-debug-service");
 $injector.require("androidDeviceDebugService", "./services/android-device-debug-service");
 
@@ -40,8 +66,6 @@ $injector.requirePublic("analyticsSettingsService", "./services/analytics-settin
 $injector.require("analyticsService", "./services/analytics/analytics-service");
 $injector.require("googleAnalyticsProvider", "./services/analytics/google-analytics-provider");
 
-$injector.require("emulatorSettingsService", "./services/emulator-settings-service");
-
 $injector.require("platformCommandParameter", "./platform-command-param");
 $injector.requireCommand("create", "./commands/create-project");
 $injector.requireCommand("generate", "./commands/generate");
@@ -59,8 +83,6 @@ $injector.requireCommand("debug|ios", "./commands/debug");
 $injector.requireCommand("debug|android", "./commands/debug");
 
 $injector.requireCommand("prepare", "./commands/prepare");
-$injector.requireCommand("clean-app|ios", "./commands/clean-app");
-$injector.requireCommand("clean-app|android", "./commands/clean-app");
 $injector.requireCommand("build|ios", "./commands/build");
 $injector.requireCommand("build|android", "./commands/build");
 $injector.requireCommand("deploy", "./commands/deploy");
@@ -109,9 +131,6 @@ $injector.require("xcprojService", "./services/xcproj-service");
 $injector.require("versionsService", "./services/versions-service");
 $injector.requireCommand("install", "./commands/install");
 
-$injector.require("projectInitService", "./services/project-init-service");
-$injector.requireCommand("init", "./commands/init");
-
 $injector.require("infoService", "./services/info-service");
 $injector.requireCommand("info", "./commands/info");
 
@@ -127,17 +146,16 @@ $injector.require("bundleValidatorHelper", "./helpers/bundle-validator-helper");
 $injector.require("androidBundleValidatorHelper", "./helpers/android-bundle-validator-helper");
 $injector.require("liveSyncCommandHelper", "./helpers/livesync-command-helper");
 $injector.require("deployCommandHelper", "./helpers/deploy-command-helper");
+$injector.require("platformCommandHelper", "./helpers/platform-command-helper");
 $injector.require("optionsTracker", "./helpers/options-track-helper");
 
 $injector.requirePublicClass("localBuildService", "./services/local-build-service");
-$injector.requirePublicClass("liveSyncService", "./services/livesync/livesync-service");
 $injector.require("LiveSyncSocket", "./services/livesync/livesync-socket");
 $injector.requirePublicClass("androidLivesyncTool", "./services/livesync/android-livesync-tool");
 $injector.require("androidLiveSyncService", "./services/livesync/android-livesync-service");
 $injector.require("iOSLiveSyncService", "./services/livesync/ios-livesync-service");
 $injector.require("usbLiveSyncService", "./services/livesync/livesync-service"); // The name is used in https://github.com/NativeScript/nativescript-dev-typescript
 $injector.require("previewAppFilesService", "./services/livesync/playground/preview-app-files-service");
-$injector.require("previewAppLiveSyncService", "./services/livesync/playground/preview-app-livesync-service");
 $injector.require("previewAppLogProvider", "./services/livesync/playground/preview-app-log-provider");
 $injector.require("previewAppPluginsService", "./services/livesync/playground/preview-app-plugins-service");
 $injector.require("previewSdkService", "./services/livesync/playground/preview-sdk-service");
@@ -191,11 +209,12 @@ $injector.require("hmrStatusService", "./services/hmr-status-service");
 $injector.require("pacoteService", "./services/pacote-service");
 $injector.require("qrCodeTerminalService", "./services/qr-code-terminal-service");
 $injector.require("testInitializationService", "./services/test-initialization-service");
-$injector.require("workflowService", "./services/workflow-service");
 
 $injector.require("networkConnectivityValidator", "./helpers/network-connectivity-validator");
 $injector.requirePublic("cleanupService", "./services/cleanup-service");
 
+$injector.require("webpackCompilerService", "./services/webpack/webpack-compiler-service");
+
 $injector.require("applePortalSessionService", "./services/apple-portal/apple-portal-session-service");
 $injector.require("applePortalCookieService", "./services/apple-portal/apple-portal-cookie-service");
 $injector.require("applePortalApplicationService", "./services/apple-portal/apple-portal-application-service");

lib/bootstrap.ts

@@ -4,16 +4,17 @@ export class AddPlatformCommand extends ValidatePlatformCommandBase implements I
 	public allowedParameters: ICommandParameter[] = [];
 
 	constructor($options: IOptions,
-		$platformService: IPlatformService,
+		private $platformCommandHelper: IPlatformCommandHelper,
+		$platformValidationService: IPlatformValidationService,
 		$projectData: IProjectData,
-		$platformsData: IPlatformsData,
+		$platformsDataService: IPlatformsDataService,
 		private $errors: IErrors) {
-			super($options, $platformsData, $platformService, $projectData);
+			super($options, $platformsDataService, $platformValidationService, $projectData);
 			this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$platformService.addPlatforms(args, this.$options.platformTemplate, this.$projectData, this.$options, this.$options.frameworkPath);
+		await this.$platformCommandHelper.addPlatforms(args, this.$projectData, this.$options.frameworkPath);
 	}
 
 	public async canExecute(args: string[]): Promise<ICanExecuteCommandOutput> {
@@ -23,9 +24,9 @@ export class AddPlatformCommand extends ValidatePlatformCommandBase implements I
 
 		let canExecute = true;
 		for (const arg of args) {
-			this.$platformService.validatePlatform(arg, this.$projectData);
+			this.$platformValidationService.validatePlatform(arg, this.$projectData);
 
-			if (!this.$platformService.isPlatformSupportedForOS(arg, this.$projectData)) {
+			if (!this.$platformValidationService.isPlatformSupportedForOS(arg, this.$projectData)) {
 				this.$errors.fail(`Applications for platform ${arg} can not be built on this OS`);
 			}
 

lib/commands/add-platform.ts

@@ -9,14 +9,14 @@ export class ListiOSApps implements ICommand {
 		private $logger: ILogger,
 		private $projectData: IProjectData,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
-		private $platformService: IPlatformService,
+		private $platformValidationService: IPlatformValidationService,
 		private $errors: IErrors,
 		private $prompter: IPrompter) {
 		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+		if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
 			this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
 		}
 

lib/commands/appstore-list.ts

@@ -1,6 +1,7 @@
-import { StringCommandParameter } from "../common/command-params";
 import * as path from "path";
-import { IOSProjectService } from "../services/ios-project-service";
+import { StringCommandParameter } from "../common/command-params";
+import { BuildController } from "../controllers/build-controller";
+import { IOSBuildData } from "../data/build-data";
 
 export class PublishIOS implements ICommand {
 	public allowedParameters: ICommandParameter[] = [new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector),
@@ -15,26 +16,18 @@ export class PublishIOS implements ICommand {
 		private $prompter: IPrompter,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $hostInfo: IHostInfo,
-		private $errors: IErrors) {
+		private $errors: IErrors,
+		private $buildController: BuildController,
+		private $platformValidationService: IPlatformValidationService
+	) {
 		this.$projectData.initializeProjectData();
 	}
 
-	private get $platformsData(): IPlatformsData {
-		return this.$injector.resolve("platformsData");
-	}
-
-	// This property was introduced due to the fact that the $platformService dependency
-	// ultimately tries to resolve the current project's dir and fails if not executed from within a project
-	private get $platformService(): IPlatformService {
-		return this.$injector.resolve("platformService");
-	}
-
 	public async execute(args: string[]): Promise<void> {
 		let username = args[0];
 		let password = args[1];
 		const mobileProvisionIdentifier = args[2];
 		const codeSignIdentity = args[3];
-		const teamID = this.$options.teamId;
 		let ipaFilePath = this.$options.ipa ? path.resolve(this.$options.ipa) : null;
 
 		if (!username) {
@@ -54,55 +47,24 @@ export class PublishIOS implements ICommand {
 		}
 
 		this.$options.release = true;
+		const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
 
 		if (!ipaFilePath) {
-			const platform = this.$devicePlatformsConstants.iOS;
 			// No .ipa path provided, build .ipa on out own.
-			const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {
-				bundle: !!this.$options.bundle,
-				release: this.$options.release,
-				useHotModuleReload: false
-			};
-			const platformInfo: IPreparePlatformInfo = {
-				platform,
-				appFilesUpdaterOptions,
-				platformTemplate: this.$options.platformTemplate,
-				projectData: this.$projectData,
-				config: this.$options,
-				env: this.$options.env
-			};
-
 			if (mobileProvisionIdentifier || codeSignIdentity) {
-				const iOSBuildConfig: IBuildConfig = {
-					projectDir: this.$options.path,
-					release: this.$options.release,
-					device: this.$options.device,
-					provision: this.$options.provision,
-					teamId: this.$options.teamId,
-					buildForDevice: true,
-					iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
-					mobileProvisionIdentifier,
-					codeSignIdentity
-				};
-				this.$logger.info("Building .ipa with the selected mobile provision and/or certificate.");
 				// This is not very correct as if we build multiple targets we will try to sign all of them using the signing identity here.
-				await this.$platformService.preparePlatform(platformInfo);
-				await this.$platformService.buildPlatform(platform, iOSBuildConfig, this.$projectData);
-				ipaFilePath = this.$platformService.lastOutputPath(platform, iOSBuildConfig, this.$projectData);
-			} else {
-				this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
-				await this.$platformService.preparePlatform(platformInfo);
-
-				const platformData = this.$platformsData.getPlatformData(platform, this.$projectData);
-				const iOSProjectService = <IOSProjectService>platformData.platformProjectService;
-
-				const archivePath = await iOSProjectService.archive(this.$projectData);
-				this.$logger.info("Archive at: " + archivePath);
+				this.$logger.info("Building .ipa with the selected mobile provision and/or certificate.");
 
-				const exportPath = await iOSProjectService.exportArchive(this.$projectData, { archivePath, teamID, provision: mobileProvisionIdentifier || this.$options.provision });
-				this.$logger.info("Export at: " + exportPath);
+				// As we need to build the package for device
+				this.$options.forDevice = true;
 
-				ipaFilePath = exportPath;
+				const buildData = new IOSBuildData(this.$projectData.projectDir, platform, this.$options);
+				ipaFilePath = await this.$buildController.prepareAndBuild(buildData);
+			} else {
+				this.$logger.info("No .ipa, mobile provision or certificate set. Perfect! Now we'll build .xcarchive and let Xcode pick the distribution certificate and provisioning profile for you when exporting .ipa for AppStore submission.");
+				const buildData = new IOSBuildData(this.$projectData.projectDir, platform, { ...this.$options, buildForAppStore: true });
+				ipaFilePath = await this.$buildController.prepareAndBuild(buildData);
+				this.$logger.info(`Export at: ${ipaFilePath}`);
 			}
 		}
 
@@ -120,7 +82,7 @@ export class PublishIOS implements ICommand {
 			this.$errors.failWithoutHelp("iOS publishing is only available on Mac OS X.");
 		}
 
-		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+		if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
 			this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
 		}