nativescript 9.0.0-alpha.8 → 9.0.0-dev.0

package/lib/config.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StaticConfig = exports.Configuration = void 0;
-const path = require("path");
-const shelljs = require("shelljs");
-const os = require("os");
 const _ = require("lodash");
+const path = require("path");
 const yok_1 = require("./common/yok");
 class Configuration {
     constructor($fs) {
@@ -61,9 +59,7 @@ class StaticConfig {
     async getAdbFilePath() {
         if (!this._adbFilePath) {
             const androidToolsInfo = this.$injector.resolve("androidToolsInfo");
-            this._adbFilePath =
-                (await androidToolsInfo.getPathToAdbFromAndroidHome()) ||
-                    (await this.getAdbFilePathCore());
+            this._adbFilePath = await androidToolsInfo.getPathToAdbFromAndroidHome();
         }
         return this._adbFilePath;
     }
@@ -85,38 +81,6 @@ class StaticConfig {
     get HTML_COMMON_HELPERS_DIR() {
         return path.join(__dirname, "common", "docs", "helpers");
     }
-    async getAdbFilePathCore() {
-        const $childProcess = this.$injector.resolve("$childProcess");
-        try {
-            const proc = await $childProcess.spawnFromEvent("adb", ["version"], "exit", undefined, { throwError: false });
-            if (proc.stderr) {
-                return await this.spawnPrivateAdb();
-            }
-        }
-        catch (e) {
-            if (e.code === "ENOENT") {
-                return await this.spawnPrivateAdb();
-            }
-        }
-        return "adb";
-    }
-    async spawnPrivateAdb() {
-        const $fs = this.$injector.resolve("$fs"), $childProcess = this.$injector.resolve("$childProcess"), $hostInfo = this.$injector.resolve("$hostInfo");
-        const defaultAdbDirPath = path.join(__dirname, "common", "resources", "platform-tools", "android", process.platform);
-        const pathToPackageJson = path.join(__dirname, "..", "package.json");
-        const nsCliVersion = require(pathToPackageJson).version;
-        const tmpDir = path.join(os.tmpdir(), `nativescript-cli-${nsCliVersion}`);
-        $fs.createDirectory(tmpDir);
-        const targetAdb = path.join(tmpDir, "adb");
-        if (!$fs.exists(tmpDir) || !$fs.readDirectory(tmpDir).length) {
-            shelljs.cp(path.join(defaultAdbDirPath, "*"), tmpDir);
-            if (!$hostInfo.isWindows) {
-                shelljs.chmod("+x", targetAdb);
-            }
-        }
-        await $childProcess.spawnFromEvent(targetAdb, ["start-server"], "exit");
-        return targetAdb;
-    }
 }
 exports.StaticConfig = StaticConfig;
 yok_1.injector.register("staticConfig", StaticConfig);

package/lib/constants.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUILD_XCCONFIG_FILE_NAME = exports.INCLUDE_GRADLE_NAME = exports.INFO_PLIST_FILE_NAME = exports.APP_GRADLE_FILE_NAME = exports.MANIFEST_FILE_NAME = exports.ANDROID_ANALYTICS_DATA_FILE = exports.ANDROID_ANALYTICS_DATA_DIR = exports.FONTS_DIR = exports.ASSETS_DIR = exports.MAIN_DIR = exports.SRC_DIR = exports.AWAIT_NOTIFICATION_TIMEOUT_SECONDS = exports.CODE_SIGN_ENTITLEMENTS = exports.LIB_DIR_NAME = exports.KARMA_CONFIG_NAME = exports.TSCCONFIG_TNS_JSON_NAME = exports.RSPACK_CONFIG_NAME = exports.WEBPACK_CONFIG_NAME = exports.HOOKS_DIR_NAME = exports.PLATFORMS_DIR_NAME = exports.XML_FILE_EXTENSION = exports.LIVESYNC_EXCLUDED_FILE_PATTERNS = exports.TEST_RUNNER_NAME = exports.TESTING_FRAMEWORKS = exports.LIVESYNC_EXCLUDED_DIRECTORIES = exports.DEFAULT_APP_IDENTIFIER_PREFIX = exports.NODE_MODULE_CACHE_PATH_KEY_NAME = exports.ANDROID_DEVICE_APP_ROOT_TEMPLATE = exports.PACKAGE_LOCK_JSON_FILE_NAME = exports.PACKAGE_JSON_FILE_NAME = exports.SCOPED_VISIONOS_RUNTIME_NAME = exports.SCOPED_IOS_RUNTIME_NAME = exports.SCOPED_ANDROID_RUNTIME_NAME = exports.TNS_IOS_RUNTIME_NAME = exports.TNS_ANDROID_RUNTIME_NAME = exports.UI_MOBILE_BASE_NAME = exports.TNS_CORE_MODULES_WIDGETS_NAME = exports.RSPACK_PLUGIN_NAME = exports.WEBPACK_PLUGIN_NAME = exports.SCOPED_TNS_CORE_THEME_NAME = exports.TNS_CORE_THEME_NAME = exports.SCOPED_TNS_CORE_MODULES = exports.TNS_CORE_MODULES_NAME = exports.TNS_MODULES_FOLDER_NAME = exports.NODE_MODULES_FOLDER_NAME = exports.NATIVESCRIPT_KEY_NAME = exports.NS_BASE_PODFILE = exports.PROJECT_FRAMEWORK_FOLDER_NAME = exports.APP_RESOURCES_FOLDER_NAME = exports.APP_FOLDER_NAME = void 0;
-exports.ProjectTypes = exports.JsFlavorName = exports.TsFlavorName = exports.SvelteFlavorName = exports.SolidFlavorName = exports.ReactFlavorName = exports.VueFlavorName = exports.NgFlavorName = exports.SVELTE_NAME = exports.SOLID_NAME = exports.REACT_NAME = exports.TYPESCRIPT_NAME = exports.JAVASCRIPT_NAME = exports.ANGULAR_NAME = exports.VUE_NAME = exports.ItunesConnectApplicationTypes = exports.androidAppResourcesFolderName = exports.iOSAppResourcesFolderName = exports.ITMSConstants = exports.ANALYTICS_LOCAL_TEMPLATE_PREFIX = exports.RESERVED_TEMPLATE_NAMES = exports.ReleaseType = exports.SaveOptions = exports.TemplatesV2PackageJsonKeysToRemove = exports.PackageJsonKeysToKeep = exports.LiveSyncTrackActionNames = exports.PackageVersion = exports.MetadataFilteringConstants = exports.IOS_WATCHAPP_EXTENSION_FOLDER = exports.IOS_WATCHAPP_FOLDER = exports.NATIVE_EXTENSION_FOLDER = exports.APPLICATION_RESPONSE_TIMEOUT_SECONDS = exports.NATIVE_SOURCE_FOLDER = exports.TNS_NATIVE_SOURCE_GROUP_NAME = exports.HASHES_FILE_NAME = exports.APKS_EXTENSION_NAME = exports.AAB_EXTENSION_NAME = exports.APK_EXTENSION_NAME = exports.DEPENDENCIES_JSON_NAME = exports.CONFIG_FILE_NAME_TS = exports.CONFIG_FILE_NAME_JS = exports.CONFIG_FILE_NAME_DISPLAY = exports.CONFIG_NS_APP_ENTRY = exports.CONFIG_NS_APP_RESOURCES_ENTRY = exports.CONFIG_NS_FILE_NAME = exports.RESOURCES_DIR = exports.BUNDLE_DIR = exports.APK_DIR = exports.OUTPUTS_DIR = exports.BUILD_DIR = void 0;
-exports.PackageManagers = exports.EMIT_APPENDER_EVENT_NAME = exports.LoggerConfigData = exports.LoggerLevel = exports.DeviceConnectionType = exports.LoggerAppenders = exports.IOSNativeTargetTypes = exports.IOSNativeTargetProductTypes = exports.IOSDeviceTargets = exports.RunOnDeviceEvents = exports.AndroidAppBundleMessages = exports.AndroidBundleValidatorMessages = exports.BundleValidatorMessages = exports.IosProjectConstants = exports.EXTENSION_PROVISIONING_FILENAME = exports.PODFILE_NAME = exports.PLUGINS_BUILD_DATA_FILENAME = exports.PLUGIN_BUILD_DATA_FILENAME = exports.AddPlaformErrors = exports.PACKAGE_PLACEHOLDER_NAME = exports.AndroidBuildDefaults = exports.Hooks = exports.XcodeDeprecationStringFormat = exports.MacOSDeprecationStringFormat = exports.MacOSVersions = exports.AssetConstants = exports.CLI_RESOURCES_DIR_NAME = exports.NATIVESCRIPT_PROPS_INTERNAL_DELIMITER = exports.AnalyticsEventLabelDelimiter = exports.DebugCommandErrors = exports.BUNDLER_COMPILATION_COMPLETE = exports.PREPARE_READY_EVENT_NAME = exports.INITIAL_SYNC_EVENT_NAME = exports.FILES_CHANGE_EVENT_NAME = exports.CACACHE_DIRECTORY_NAME = exports.ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE = exports.ANDROID_RELEASE_BUILD_ERROR_MESSAGE = exports.POST_INSTALL_COMMAND_NAME = exports.INSPECTOR_CACHE_DIRNAME = exports.VERSION_STRING = exports.DEBUGGER_DETACHED_EVENT_NAME = exports.DEBUGGER_ATTACHED_EVENT_NAME = exports.USER_INTERACTION_NEEDED_EVENT_NAME = exports.CONNECTION_ERROR_EVENT_NAME = exports.BUILD_OUTPUT_EVENT_NAME = void 0;
+exports.JsFlavorName = exports.TsFlavorName = exports.SvelteFlavorName = exports.SolidFlavorName = exports.ReactFlavorName = exports.VueFlavorName = exports.NgFlavorName = exports.SVELTE_NAME = exports.SOLID_NAME = exports.REACT_NAME = exports.TYPESCRIPT_NAME = exports.JAVASCRIPT_NAME = exports.ANGULAR_NAME = exports.VUE_NAME = exports.ItunesConnectApplicationTypes = exports.androidAppResourcesFolderName = exports.iOSAppResourcesFolderName = exports.ITMSConstants = exports.ANALYTICS_LOCAL_TEMPLATE_PREFIX = exports.RESERVED_TEMPLATE_NAMES = exports.ReleaseType = exports.SaveOptions = exports.TemplatesV2PackageJsonKeysToRemove = exports.PackageJsonKeysToKeep = exports.LiveSyncTrackActionNames = exports.PackageVersion = exports.MetadataFilteringConstants = exports.IOS_WATCHAPP_EXTENSION_FOLDER = exports.IOS_WATCHAPP_FOLDER = exports.NATIVE_EXTENSION_FOLDER = exports.APPLICATION_RESPONSE_TIMEOUT_SECONDS = exports.NATIVE_SOURCE_FOLDER = exports.TNS_NATIVE_SOURCE_GROUP_NAME = exports.HASHES_FILE_NAME = exports.APKS_EXTENSION_NAME = exports.AAB_EXTENSION_NAME = exports.APK_EXTENSION_NAME = exports.DEPENDENCIES_JSON_NAME = exports.CONFIG_FILE_NAME_TS = exports.CONFIG_FILE_NAME_JS = exports.CONFIG_FILE_NAME_DISPLAY = exports.CONFIG_NS_APP_ENTRY = exports.CONFIG_NS_BUILD_ENTRY = exports.CONFIG_NS_APP_RESOURCES_ENTRY = exports.CONFIG_NS_FILE_NAME = exports.RESOURCES_DIR = exports.BUNDLE_DIR = exports.APK_DIR = exports.OUTPUTS_DIR = exports.BUILD_DIR = void 0;
+exports.PackageManagers = exports.EMIT_APPENDER_EVENT_NAME = exports.LoggerConfigData = exports.LoggerLevel = exports.DeviceConnectionType = exports.LoggerAppenders = exports.IOSNativeTargetTypes = exports.IOSNativeTargetProductTypes = exports.IOSDeviceTargets = exports.RunOnDeviceEvents = exports.AndroidAppBundleMessages = exports.AndroidBundleValidatorMessages = exports.BundleValidatorMessages = exports.IosProjectConstants = exports.EXTENSION_PROVISIONING_FILENAME = exports.PODFILE_NAME = exports.PLUGINS_BUILD_DATA_FILENAME = exports.PLUGIN_BUILD_DATA_FILENAME = exports.AddPlaformErrors = exports.PACKAGE_PLACEHOLDER_NAME = exports.AndroidBuildDefaults = exports.Hooks = exports.XcodeDeprecationStringFormat = exports.MacOSDeprecationStringFormat = exports.MacOSVersions = exports.AssetConstants = exports.CLI_RESOURCES_DIR_NAME = exports.NATIVESCRIPT_PROPS_INTERNAL_DELIMITER = exports.AnalyticsEventLabelDelimiter = exports.DebugCommandErrors = exports.BUNDLER_COMPILATION_COMPLETE = exports.PREPARE_READY_EVENT_NAME = exports.INITIAL_SYNC_EVENT_NAME = exports.FILES_CHANGE_EVENT_NAME = exports.CACACHE_DIRECTORY_NAME = exports.ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE = exports.ANDROID_RELEASE_BUILD_ERROR_MESSAGE = exports.POST_INSTALL_COMMAND_NAME = exports.INSPECTOR_CACHE_DIRNAME = exports.VERSION_STRING = exports.DEBUGGER_DETACHED_EVENT_NAME = exports.DEBUGGER_ATTACHED_EVENT_NAME = exports.USER_INTERACTION_NEEDED_EVENT_NAME = exports.CONNECTION_ERROR_EVENT_NAME = exports.BUILD_OUTPUT_EVENT_NAME = exports.ProjectTypes = void 0;
 const path_1 = require("path");
 exports.APP_FOLDER_NAME = "app";
 exports.APP_RESOURCES_FOLDER_NAME = "App_Resources";
@@ -61,6 +61,7 @@ exports.BUNDLE_DIR = "bundle";
 exports.RESOURCES_DIR = "res";
 exports.CONFIG_NS_FILE_NAME = "nsconfig.json";
 exports.CONFIG_NS_APP_RESOURCES_ENTRY = "appResourcesPath";
+exports.CONFIG_NS_BUILD_ENTRY = "buildPath";
 exports.CONFIG_NS_APP_ENTRY = "appPath";
 exports.CONFIG_FILE_NAME_DISPLAY = "nativescript.config.(js|ts)";
 exports.CONFIG_FILE_NAME_JS = "nativescript.config.js";

package/lib/controllers/build-controller.js

@@ -66,7 +66,7 @@ class BuildController extends events_1.EventEmitter {
         this.$logger.info(`Build time: ${buildTime.toFixed(3)} s.`);
         const result = await this.$buildArtifactsService.getLatestAppPackagePath(platformData, buildData);
         if (buildData.copyTo) {
-            this.$buildArtifactsService.copyLatestAppPackage(buildData.copyTo, platformData, buildData);
+            this.$buildArtifactsService.copyAppPackages(buildData.copyTo, platformData, buildData);
         }
         else {
             this.$logger.info(`The build result is located at: ${result}`);

package/lib/controllers/deploy-controller.js

@@ -20,8 +20,11 @@ class DeployController {
                 },
             };
             await this.$prepareController.prepare(prepareData);
-            const packageFilePath = await deviceDescriptor.buildAction();
-            await this.$deviceInstallAppService.installOnDevice(device, { ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator }, packageFilePath);
+            await deviceDescriptor.buildAction();
+            await this.$deviceInstallAppService.installOnDevice(device, {
+                ...deviceDescriptor.buildData,
+                buildForDevice: !device.isEmulator,
+            });
         };
         await this.$devicesService.execute(executeAction, (device) => _.some(deviceDescriptors, (deviceDescriptor) => deviceDescriptor.identifier === device.deviceInfo.identifier));
     }

package/lib/controllers/migrate-controller.js

@@ -14,7 +14,7 @@ const fs = require("fs");
 const os_1 = require("os");
 const color_1 = require("../color");
 class MigrateController extends update_controller_base_1.UpdateControllerBase {
-    constructor($fs, $platformCommandHelper, $platformsDataService, $packageInstallationManager, $packageManager, $pacoteService, $logger, $errors, $pluginsService, $projectDataService, $projectConfigService, $options, $resources, $injector, $settingsService, $staticConfig, $terminalSpinnerService, $projectCleanupService, $projectBackupService, $childProcess) {
+    constructor($fs, $platformCommandHelper, $platformsDataService, $packageInstallationManager, $packageManager, $pacoteService, $logger, $errors, $pluginsService, $projectDataService, $projectConfigService, $projectData, $options, $resources, $injector, $settingsService, $staticConfig, $terminalSpinnerService, $projectCleanupService, $projectBackupService, $childProcess) {
         super($fs, $platformCommandHelper, $platformsDataService, $packageInstallationManager, $packageManager, $pacoteService);
         this.$fs = $fs;
         this.$platformCommandHelper = $platformCommandHelper;
@@ -27,6 +27,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
         this.$pluginsService = $pluginsService;
         this.$projectDataService = $projectDataService;
         this.$projectConfigService = $projectConfigService;
+        this.$projectData = $projectData;
         this.$options = $options;
         this.$resources = $resources;
         this.$injector = $injector;
@@ -65,7 +66,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
             },
             {
                 packageName: "nativescript-dev-webpack",
-                replaceWith: "@nativescript/webpack",
+                replaceWith: constants.WEBPACK_PLUGIN_NAME,
                 shouldRemove: true,
                 isDev: true,
                 async shouldMigrateAction() {
@@ -74,7 +75,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
                 migrateAction: this.migrateWebpack.bind(this),
             },
             {
-                packageName: "@nativescript/webpack",
+                packageName: constants.WEBPACK_PLUGIN_NAME,
                 minVersion: "3.0.0",
                 desiredVersion: "~5.0.0",
                 shouldAddIfMissing: true,
@@ -406,7 +407,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
     async cleanUpProject(projectData) {
         await this.$projectCleanupService.clean([
             constants.HOOKS_DIR_NAME,
-            constants.PLATFORMS_DIR_NAME,
+            this.$projectData.getBuildRelativeDirectoryPath(),
             constants.NODE_MODULES_FOLDER_NAME,
             constants.PACKAGE_LOCK_JSON_FILE_NAME,
         ]);
@@ -955,7 +956,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
         this.spinner.info(`Initializing new ${color_1.color.yellow("webpack.config.js")}`);
         const { desiredVersion: webpackVersion } = this.migrationDependencies.find((dep) => dep.packageName === constants.WEBPACK_PLUGIN_NAME);
         try {
-            const scopedWebpackPackage = `@nativescript/webpack`;
+            const scopedWebpackPackage = constants.WEBPACK_PLUGIN_NAME;
             const resolvedVersion = await this.$packageInstallationManager.getMaxSatisfyingVersion(scopedWebpackPackage, webpackVersion);
             await this.runNPX([
                 "--package",

package/lib/controllers/platform-controller.js

@@ -29,7 +29,8 @@ class PlatformController {
         const packageToInstall = await this.getPackageToInstall(platformData, projectData, addPlatformData.frameworkPath, version);
         this.$logger.trace("Determined package to install is", packageToInstall);
         const installedPlatformVersion = await this.$addPlatformService.addPlatformSafe(projectData, platformData, packageToInstall, addPlatformData);
-        this.$fs.ensureDirectoryExists(path.join(projectData.platformsDir, platform));
+        const buildPath = projectData.platformsDir;
+        this.$fs.ensureDirectoryExists(path.join(buildPath, platform));
         if (this.$mobileHelper.isAndroidPlatform(platform)) {
             const gradlePropertiesPath = path.resolve(platformData.projectRoot, "gradle.properties");
             const commentHeader = "# App configuration";
@@ -48,6 +49,7 @@ class PlatformController {
                     commentHeader,
                     `appPath = ${appPath}`,
                     `appResourcesPath = ${appResourcesPath}`,
+                    `buildPath = ${buildPath}`,
                     "",
                 ].join("\n");
                 gradlePropertiesContents += dataToWrite;

package/lib/controllers/prepare-controller.js

@@ -15,6 +15,7 @@ const decorators_1 = require("../common/decorators");
 const helpers_1 = require("../common/helpers");
 const yok_1 = require("../common/yok");
 const constants_1 = require("../constants");
+const resolve_package_path_1 = require("@rigor789/resolve-package-path");
 class PrepareController extends events_1.EventEmitter {
     constructor($platformController, $hooksService, $fs, $logger, $options, $mobileHelper, $nodeModulesDependenciesBuilder, $platformsDataService, $pluginsService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $bundlerCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
         super();
@@ -142,10 +143,15 @@ class PrepareController extends events_1.EventEmitter {
     async startJSWatcherWithPrepare(platformData, projectData, prepareData) {
         if (!this.watchersData[projectData.projectDir][platformData.platformNameLowerCase].hasWebpackCompilerProcess) {
             const handler = (data) => {
+                var _a;
                 if (data.platform.toLowerCase() === platformData.platformNameLowerCase) {
                     if (this.isFileWatcherPaused())
                         return;
-                    this.emitPrepareEvent({ ...data, hasNativeChanges: false });
+                    this.emitPrepareEvent({
+                        ...data,
+                        files: (_a = data.files) !== null && _a !== void 0 ? _a : [],
+                        hasNativeChanges: false,
+                    });
                 }
             };
             this.webpackCompilerHandler = handler.bind(this);
@@ -191,7 +197,7 @@ class PrepareController extends events_1.EventEmitter {
                 this.$logger.info(`Chokidar raised event ${event} for ${filePath}.`);
                 await this.writeRuntimePackageJson(projectData, platformData);
                 this.emitPrepareEvent({
-                    files: [],
+                    files: [filePath],
                     staleFiles: [],
                     hasOnlyHotUpdateFiles: false,
                     hmrData: null,
@@ -221,28 +227,63 @@ class PrepareController extends events_1.EventEmitter {
         return patterns;
     }
     async writeRuntimePackageJson(projectData, platformData, prepareData = null) {
+        var _a, _b;
         const configInfo = this.$projectConfigService.detectProjectConfigs(projectData.projectDir);
         if (configInfo.usingNSConfig) {
             return;
         }
         this.$logger.info("Updating runtime package.json with configuration values...");
-        const nsConfig = this.$projectConfigService.readConfig(projectData.projectDir);
+        const { hooks, ignoredNativeDependencies, webpackPackageName, webpackConfigPath, appResourcesPath, buildPath, appPath, ...nsConfig } = this.$projectConfigService.readConfig(projectData.projectDir);
+        const platform = platformData.platformNameLowerCase;
+        let installedRuntimePackageJSON;
+        let runtimePackageName;
+        if (platform === "ios") {
+            runtimePackageName = ((_a = projectData.nsConfig.ios) === null || _a === void 0 ? void 0 : _a.runtimePackageName) || constants_1.SCOPED_IOS_RUNTIME_NAME;
+        }
+        else if (platform === "android") {
+            runtimePackageName = ((_b = projectData.nsConfig.android) === null || _b === void 0 ? void 0 : _b.runtimePackageName) || constants_1.SCOPED_ANDROID_RUNTIME_NAME;
+        }
+        const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(runtimePackageName, {
+            paths: [projectData.projectDir],
+        });
+        if (installedRuntimePackageJSONPath) {
+            installedRuntimePackageJSON = this.$fs.readJson(installedRuntimePackageJSONPath);
+        }
         const packageData = {
             ..._.pick(projectData.packageJsonData, ["name"]),
             ...nsConfig,
             main: "bundle",
+            ...(installedRuntimePackageJSON ? {} : {})
         };
-        if (platformData.platformNameLowerCase === "ios" &&
-            packageData.ios &&
-            packageData.ios.discardUncaughtJsExceptions) {
-            packageData.discardUncaughtJsExceptions =
-                packageData.ios.discardUncaughtJsExceptions;
+        if (platform === "ios") {
+            if (installedRuntimePackageJSON) {
+                packageData.ios = packageData.ios || {};
+                packageData.ios.runtime = {
+                    version: installedRuntimePackageJSON.version
+                };
+            }
+            if (packageData.ios &&
+                packageData.ios.discardUncaughtJsExceptions) {
+                packageData.discardUncaughtJsExceptions =
+                    packageData.ios.discardUncaughtJsExceptions;
+            }
+            delete packageData.android;
         }
-        if (platformData.platformNameLowerCase === "android" &&
-            packageData.android &&
-            packageData.android.discardUncaughtJsExceptions) {
-            packageData.discardUncaughtJsExceptions =
-                packageData.android.discardUncaughtJsExceptions;
+        if (platform === "android") {
+            if (installedRuntimePackageJSON) {
+                packageData.android = packageData.android || {};
+                packageData.android.runtime = {
+                    version: installedRuntimePackageJSON.version,
+                    version_info: installedRuntimePackageJSON.version_info,
+                    gradle: installedRuntimePackageJSON.gradle
+                };
+            }
+            if (packageData.android &&
+                packageData.android.discardUncaughtJsExceptions) {
+                packageData.discardUncaughtJsExceptions =
+                    packageData.android.discardUncaughtJsExceptions;
+            }
+            delete packageData.ios;
         }
         let packagePath;
         if (this.$mobileHelper.isApplePlatform(platformData.platformNameLowerCase)) {

package/lib/controllers/run-controller.js

@@ -14,6 +14,7 @@ const events_1 = require("events");
 const util = require("util");
 const _ = require("lodash");
 const yok_1 = require("../common/yok");
+const helpers_1 = require("../common/helpers");
 class RunController extends events_1.EventEmitter {
     constructor($analyticsService, $buildController, $debugController, $deviceInstallAppService, $devicesService, $errors, $injector, $hmrStatusService, $hooksService, $liveSyncServiceResolver, $liveSyncProcessDataService, $logger, $mobileHelper, $platformsDataService, $pluginsService, $prepareController, $prepareDataService, $prepareNativePlatformService, $projectChangesService, $projectDataService) {
         super();
@@ -61,11 +62,12 @@ class RunController extends events_1.EventEmitter {
                     const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, data.platform, { ...liveSyncInfo, watch: !liveSyncInfo.skipWatcher });
                     const changesInfo = await this.$projectChangesService.checkForChanges(platformData, projectData, prepareData);
                     if (changesInfo.hasChanges) {
-                        await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
+                        await this.syncChangedDataOnDevices(data, projectData, platformData, liveSyncInfo);
                     }
                 }
                 else {
-                    await this.syncChangedDataOnDevices(data, projectData, liveSyncInfo);
+                    const platformData = this.$platformsDataService.getPlatformData(data.platform, projectData);
+                    await this.syncChangedDataOnDevices(data, projectData, platformData, liveSyncInfo);
                 }
             };
             this.prepareReadyEventHandler = handler.bind(this);
@@ -276,26 +278,21 @@ class RunController extends events_1.EventEmitter {
             };
             const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
             try {
-                let packageFilePath = null;
                 if (rebuiltInformation[platformData.platformNameLowerCase] &&
                     (this.$mobileHelper.isAndroidPlatform(platformData.platformNameLowerCase) ||
                         rebuiltInformation[platformData.platformNameLowerCase]
                             .isEmulator === device.isEmulator)) {
-                    packageFilePath =
-                        rebuiltInformation[platformData.platformNameLowerCase]
-                            .packageFilePath;
-                    await this.$deviceInstallAppService.installOnDevice(device, buildData, packageFilePath);
+                    await this.$deviceInstallAppService.installOnDevice(device, buildData);
                 }
                 else {
                     const shouldBuild = prepareResultData.hasNativeChanges ||
                         buildData.nativePrepare.forceRebuildNativeApp ||
                         (await this.$buildController.shouldBuild(buildData));
                     if (shouldBuild) {
-                        packageFilePath = await deviceDescriptor.buildAction();
+                        await deviceDescriptor.buildAction();
                         rebuiltInformation[platformData.platformNameLowerCase] = {
                             isEmulator: device.isEmulator,
                             platform: platformData.platformNameLowerCase,
-                            packageFilePath,
                         };
                     }
                     else {
@@ -305,7 +302,7 @@ class RunController extends events_1.EventEmitter {
                             projectDir: projectData.projectDir,
                         });
                     }
-                    await this.$deviceInstallAppService.installOnDeviceIfNeeded(device, buildData, packageFilePath);
+                    await this.$deviceInstallAppService.installOnDeviceIfNeeded(device, buildData);
                 }
                 const platformLiveSyncService = this.$liveSyncServiceResolver.resolveLiveSyncService(platformData.platformNameLowerCase);
                 const { force, useHotModuleReload, skipWatcher } = liveSyncInfo;
@@ -343,7 +340,7 @@ class RunController extends events_1.EventEmitter {
         };
         await this.addActionToChain(projectData.projectDir, () => this.$devicesService.execute(deviceAction, (device) => _.some(deviceDescriptors, (deviceDescriptor) => deviceDescriptor.identifier === device.deviceInfo.identifier)));
     }
-    async syncChangedDataOnDevices(data, projectData, liveSyncInfo) {
+    async syncChangedDataOnDevices(data, projectData, platformData, liveSyncInfo) {
         const successfullySyncedMessageFormat = `Successfully synced application %s on device %s.`;
         const rebuiltInformation = {};
         const deviceAction = async (device) => {
@@ -392,8 +389,7 @@ class RunController extends events_1.EventEmitter {
                             packageFilePath: null,
                         };
                     }
-                    await this.$deviceInstallAppService.installOnDevice(device, deviceDescriptor.buildData, rebuiltInformation[platformData.platformNameLowerCase]
-                        .packageFilePath);
+                    await this.$deviceInstallAppService.installOnDevice(device, deviceDescriptor.buildData);
                     await platformLiveSyncService.syncAfterInstall(device, watchInfo);
                     await this.refreshApplication(projectData, {
                         deviceAppData,
@@ -509,4 +505,7 @@ __decorate([
 __decorate([
     (0, decorators_1.cache)()
 ], RunController.prototype, "attachDeviceLostHandler", null);
+__decorate([
+    (0, helpers_1.hook)("syncChangedDataOnDevices")
+], RunController.prototype, "syncChangedDataOnDevices", null);
 yok_1.injector.register("runController", RunController);

package/lib/controllers/update-controller.js

@@ -123,7 +123,7 @@ class UpdateController extends update_controller_base_1.UpdateControllerBase {
     async cleanUpProject() {
         await this.$projectCleanupService.clean([
             constants.HOOKS_DIR_NAME,
-            constants.PLATFORMS_DIR_NAME,
+            this.$projectDataService.getProjectData().getBuildRelativeDirectoryPath(),
             constants.NODE_MODULES_FOLDER_NAME,
             constants.PACKAGE_LOCK_JSON_FILE_NAME,
         ]);
@@ -135,7 +135,7 @@ UpdateController.updatableDependencies = [
         packageName: "@nativescript/core",
     },
     {
-        packageName: "@nativescript/webpack",
+        packageName: constants.WEBPACK_PLUGIN_NAME,
         isDev: true,
     },
     {

package/lib/data/build-data.js

@@ -36,6 +36,8 @@ class AndroidBuildData extends BuildData {
         this.keyStoreAliasPassword = data.keyStoreAliasPassword;
         this.keyStorePassword = data.keyStorePassword;
         this.androidBundle = data.androidBundle || data.aab;
+        this.buildFilterDevicesArch = !this.androidBundle && data.filterDevicesArch !== false;
+        this.gradleFlavor = data.gradleFlavor;
         this.gradlePath = data.gradlePath;
         this.gradleArgs = data.gradleArgs;
         this.hostProjectPath = data.hostProjectPath;

package/lib/declarations.d.ts

@@ -585,7 +585,9 @@ interface IEmbedOptions {
 
 interface IAndroidOptions extends IEmbedOptions {
 	gradlePath: string;
-	gradleArgs: string;
+	gradleFlavor: string;
+	gradleArgs: string[];
+	overrideRuntimeGradleFiles: boolean;
 }
 
 interface IIOSOptions extends IEmbedOptions {}

package/lib/definitions/android-plugin-migrator.d.ts

@@ -10,8 +10,9 @@ interface IAndroidBuildOptions {
 	pluginName: string;
 	aarOutputDir: string;
 	tempPluginDirPath: string;
+	gradleArgs?: string[];
 	gradlePath?: string;
-	gradleArgs?: string;
+	aarSuffix?: string;
 }
 
 interface IAndroidPluginBuildService {
@@ -48,5 +49,5 @@ interface IBuildAndroidPluginData extends Partial<IProjectDir> {
 	/**
 	 * Optional custom Gradle arguments.
 	 */
-	gradleArgs?: string;
+	gradleArgs?: string[];
 }

package/lib/definitions/build.d.ts

@@ -31,8 +31,10 @@ interface IAndroidBuildData
 	extends IBuildData,
 		IAndroidSigningData,
 		IHasAndroidBundle {
+	buildFilterDevicesArch?: boolean;
+	gradleArgs?: string[];
+	gradleFlavor?: string;
 	gradlePath?: string;
-	gradleArgs?: string;
 }
 
 interface IAndroidSigningData {
@@ -62,7 +64,7 @@ interface IBuildArtifactsService {
 		platformData: IPlatformData,
 		buildOutputOptions: IBuildOutputOptions
 	): Promise<string>;
-	copyLatestAppPackage(
+	copyAppPackages(
 		targetPath: string,
 		platformData: IPlatformData,
 		buildOutputOptions: IBuildOutputOptions

package/lib/definitions/hooks.d.ts

@@ -0,0 +1 @@
+declare module "@nativescript/hook";

package/lib/definitions/ios-debugger-port-service.d.ts

@@ -11,7 +11,7 @@ interface IIOSDebuggerPortData {
 
 interface IIOSDebuggerPortStoredData {
 	port: number;
-	timer?: NodeJS.Timer;
+	timer?: NodeJS.Timeout;
 	error?: Error;
 }
 

package/lib/definitions/livesync.d.ts

@@ -18,7 +18,7 @@ import {
 
 declare global {
 	interface ILiveSyncProcessData {
-		timer: NodeJS.Timer;
+		timer: NodeJS.Timeout;
 		actionsChain: Promise<any>;
 		isStopped: boolean;
 		deviceDescriptors: ILiveSyncDeviceDescriptor[];

package/lib/definitions/project.d.ts

@@ -125,6 +125,8 @@ export type BundlerType = "webpack" | "rspack" | "vite";
 
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
+	runtimePackageName?: string
+	cocoapodUseBundleExec?: boolean
 	/**
 	 * Swift Package Manager
 	 * List packages to be included in the iOS build.
@@ -168,6 +170,14 @@ interface INsConfigAndroid extends INsConfigPlaform {
 	enableLineBreakpoints?: boolean;
 
 	enableMultithreadedJavascript?: boolean;
+
+	gradleVersion?: string;
+
+	gradleArgs?: string[];
+
+	plugins?:{ [k:string]: { aarSuffix?: string } }
+
+	runtimePackageName?: string
 }
 
 interface INsConfigHooks {
@@ -180,8 +190,10 @@ interface INsConfig {
 	main?: string;
 	appPath?: string;
 	appResourcesPath?: string;
+	buildPath?: string;
 	shared?: boolean;
 	overridePods?: string;
+	webpackPackageName?: string;
 	webpackConfigPath?: string;
 	bundlerConfigPath?: string;
 	bundler?: BundlerType;
@@ -191,6 +203,7 @@ interface INsConfig {
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
 	projectName?: string;
+	corePackageName?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -256,6 +269,7 @@ interface IProjectData extends ICreateProjectData {
 	getAppDirectoryRelativePath(): string;
 	getAppResourcesDirectoryPath(projectDir?: string): string;
 	getAppResourcesRelativeDirectoryPath(): string;
+	getBuildRelativeDirectoryPath(): string;
 }
 
 interface IProjectDataService {

package/lib/definitions/run.d.ts

@@ -31,13 +31,11 @@ declare global {
 	interface IDeviceInstallAppService {
 		installOnDevice(
 			device: Mobile.IDevice,
-			buildData: IBuildData,
-			packageFile?: string
+			buildData: IBuildData
 		): Promise<void>;
 		installOnDeviceIfNeeded(
 			device: Mobile.IDevice,
-			buildData: IBuildData,
-			packageFile?: string
+			buildData: IBuildData
 		): Promise<void>;
 		shouldInstall(
 			device: Mobile.IDevice,

package/lib/helpers/deploy-command-helper.js

@@ -36,6 +36,7 @@ class DeployCommandHelper {
             const buildData = this.$buildDataService.getBuildData(this.$projectData.projectDir, d.deviceInfo.platform, {
                 ...this.$options.argv,
                 outputPath,
+                buildFilterDevicesArch: false,
                 buildForDevice: !d.isEmulator,
                 skipWatcher: !this.$options.watch,
                 nativePrepare: {

package/lib/nativescript-cli.js

@@ -5,6 +5,34 @@ require("./bootstrap");
 const shelljs = require("shelljs");
 shelljs.config.silent = true;
 shelljs.config.fatal = true;
+if (process.platform === "win32") {
+    const realcp = shelljs.cp;
+    shelljs.cp = (...args) => {
+        if (args.length === 3) {
+            args[1] = replaceDashes(args[1]);
+        }
+        else {
+            args[0] = replaceDashes(args[0]);
+        }
+        if (args.length == 2) {
+            realcp(args[0], args[1]);
+        }
+        else {
+            realcp(args[0], args[1], args[2]);
+        }
+    };
+    function replaceDashes(values) {
+        if (Array.isArray(values)) {
+            for (let i = 0; i < values.length; ++i) {
+                values[i] = replaceDashes(values[i]);
+            }
+            return values;
+        }
+        else {
+            return values.replace(/\\/g, "/");
+        }
+    }
+}
 const errors_1 = require("./common/errors");
 const helpers_1 = require("./common/helpers");
 const yok_1 = require("./common/yok");

package/lib/options.js

@@ -184,7 +184,7 @@ class Options {
             default: { type: "boolean", hasSensitiveValue: false },
             count: { type: "number", hasSensitiveValue: false },
             analyticsLogFile: { type: "string", hasSensitiveValue: true },
-            disableAnalytics: { type: "boolean", hasSensitiveValue: false },
+            disableAnalytics: { type: "boolean", hasSensitiveValue: false, default: true },
             cleanupLogFile: { type: "string", hasSensitiveValue: true },
             hooks: {
                 type: "boolean",
@@ -196,8 +196,14 @@ class Options {
                 default: false,
                 hasSensitiveValue: false,
             },
+            overrideRuntimeGradleFiles: { type: "boolean", hasSensitiveValue: false },
+            gradleFlavor: { type: "string", hasSensitiveValue: false },
             gradlePath: { type: "string", hasSensitiveValue: false },
-            gradleArgs: { type: "string", hasSensitiveValue: false },
+            gradleArgs: {
+                type: "string",
+                hasSensitiveValue: false,
+                array: true,
+            },
             hostProjectPath: { type: "string", hasSensitiveValue: false },
             hostProjectModuleName: {
                 type: "string",
@@ -205,6 +211,7 @@ class Options {
                 default: constants_1.APP_FOLDER_NAME,
             },
             aab: { type: "boolean", hasSensitiveValue: false },
+            filterDevicesArch: { type: "boolean", hasSensitiveValue: false },
             performance: { type: "object", hasSensitiveValue: true },
             appleApplicationSpecificPassword: {
                 type: "string",