@akylas/nativescript-cli 8.9.4 → 8.10.0

package/lib/common/logger/logger.js

@@ -27,7 +27,7 @@ class Logger {
         this.passwordReplacement = "$1$3*******$2$4";
         this.defaultLogLevel = this.$config.DEBUG
             ? constants_1.LoggerLevel.TRACE
-            : constants_1.LoggerLevel.WARN;
+            : constants_1.LoggerLevel.INFO;
     }
     initialize(opts) {
         opts = opts || {};
@@ -110,8 +110,8 @@ class Logger {
         const opts = {
             unescape: true,
             link: color_1.color.red,
-            strong: color_1.color.green.bold,
-            firstHeading: color_1.color.blue.bold,
+            strong: (str) => color_1.color.styleText(["green", "bold"], str),
+            firstHeading: (str) => color_1.color.styleText(["blue", "bold"], str),
             tableOptions: {
                 chars: { mid: "", "left-mid": "", "mid-mid": "", "right-mid": "" },
                 style: {

package/lib/common/mobile/android/android-device.js

@@ -48,7 +48,7 @@ class AndroidDevice {
             abis: [
                 ...details["cpu.abilist64"].split(","),
                 ...details["cpu.abilist32"].split(","),
-            ],
+            ].filter(s => s.length > 0),
             version,
             vendor: details.brand,
             platform: this.$devicePlatformsConstants.Android,

package/lib/common/mobile/android/android-emulator-services.js

@@ -37,14 +37,16 @@ class AndroidEmulatorServices {
     async getRunningEmulatorName(emulatorId) {
         let result = await this.$androidVirtualDeviceService.getRunningEmulatorName(emulatorId);
         if (!result) {
-            result = await this.$androidGenymotionService.getRunningEmulatorName(emulatorId);
+            result =
+                await this.$androidGenymotionService.getRunningEmulatorName(emulatorId);
         }
         return result;
     }
     async getRunningEmulatorImageIdentifier(emulatorId) {
         let result = await this.$androidVirtualDeviceService.getRunningEmulatorImageIdentifier(emulatorId);
         if (!result) {
-            result = await this.$androidGenymotionService.getRunningEmulatorImageIdentifier(emulatorId);
+            result =
+                await this.$androidGenymotionService.getRunningEmulatorImageIdentifier(emulatorId);
         }
         return result;
     }
@@ -116,13 +118,13 @@ class AndroidEmulatorServices {
         let pathToEmulatorExecutable = null;
         let startEmulatorArgs = null;
         if (emulator.vendor === constants_1.AndroidVirtualDevice.AVD_VENDOR_NAME) {
-            pathToEmulatorExecutable = this.$androidVirtualDeviceService
-                .pathToEmulatorExecutable;
+            pathToEmulatorExecutable =
+                this.$androidVirtualDeviceService.pathToEmulatorExecutable;
             startEmulatorArgs = this.$androidVirtualDeviceService.startEmulatorArgs(emulator.imageIdentifier);
         }
         else if (emulator.vendor === constants_1.AndroidVirtualDevice.GENYMOTION_VENDOR_NAME) {
-            pathToEmulatorExecutable = this.$androidGenymotionService
-                .pathToEmulatorExecutable;
+            pathToEmulatorExecutable =
+                this.$androidGenymotionService.pathToEmulatorExecutable;
             startEmulatorArgs = this.$androidGenymotionService.startEmulatorArgs(emulator.imageIdentifier);
         }
         this.$logger.info(`Starting Android emulator with image ${emulator.imageIdentifier}`);

package/lib/common/mobile/device-log-provider.js

@@ -25,13 +25,12 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
         };
         this.deviceColorMap = new Map();
         this.colorPool = [
-            "bgBlackBright",
-            "bgMagentaBright",
+            "bgGray",
             "bgBlueBright",
             "bgWhiteBright",
             "bgCyanBright",
             "bgYellowBright",
-            "bgGreenBright",
+            "bgMagentaBright",
         ];
         this.colorPoolIndex = 0;
     }
@@ -113,7 +112,7 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
                 .join("")
                 .trimEnd();
             toLog.split("\n").forEach((actualLine) => {
-                this.printLine(color_1.color[this.getDeviceColor(deviceIdentifier)](" "), this.consoleLevelColor[level](actualLine));
+                this.printLine(color_1.color.styleText(this.getDeviceColor(deviceIdentifier), " "), this.consoleLevelColor[level](actualLine));
             });
         }
     }

package/lib/common/project-helper.js

@@ -6,7 +6,8 @@ const _ = require("lodash");
 const yok_1 = require("./yok");
 const constants_1 = require("../constants");
 class ProjectHelper {
-    constructor($logger, $fs, $staticConfig, $errors, $options) {
+    constructor($injector, $logger, $fs, $staticConfig, $errors, $options) {
+        this.$injector = $injector;
         this.$logger = $logger;
         this.$fs = $fs;
         this.$staticConfig = $staticConfig;
@@ -57,7 +58,8 @@ class ProjectHelper {
     isProjectFileCorrect(projectFilePath) {
         try {
             const fileContent = this.$fs.readText(projectFilePath);
-            return (fileContent.includes(constants_1.SCOPED_TNS_CORE_MODULES) ||
+            const packageName = this.getProjectData(path.dirname(projectFilePath)).nsConfig.corePackageName || constants_1.SCOPED_TNS_CORE_MODULES;
+            return (fileContent.includes(packageName) ||
                 fileContent.includes(constants_1.TNS_CORE_MODULES_NAME));
         }
         catch (err) {
@@ -65,6 +67,17 @@ class ProjectHelper {
         }
         return false;
     }
+    getProjectData(projectFilePath) {
+        try {
+            const projectData = this.$injector.resolve("projectData");
+            projectData.initializeProjectData(projectFilePath);
+            return projectData;
+        }
+        catch (error) {
+            console.error(error);
+            return null;
+        }
+    }
 }
 exports.ProjectHelper = ProjectHelper;
 yok_1.injector.register("projectHelper", ProjectHelper);

package/lib/common/verify-node-version.js

@@ -28,7 +28,7 @@ function verifyNodeVersion() {
     if (versionsCausingFailure.indexOf(nodeVer) !== -1 ||
         !semver.valid(nodeVer) ||
         semver.lt(nodeVer, minimumRequiredVersion)) {
-        console.error(color_1.color.red.bold(util.format("%sNode.js '%s' is not supported. To be able to work with %s CLI, install any Node.js version in the following range: %s.%s", os.EOL, nodeVer, cliName, supportedVersionsRange, os.EOL)));
+        console.error(color_1.color.bold(color_1.color.red(util.format("%sNode.js '%s' is not supported. To be able to work with %s CLI, install any Node.js version in the following range: %s.%s", os.EOL, nodeVer, cliName, supportedVersionsRange, os.EOL))));
         process.exit(1);
     }
 }

package/lib/constants.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OUTPUTS_DIR = exports.BUILD_DIR = 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.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.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.BUILD_OUTPUT_EVENT_NAME = 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_BUILD_ENTRY = exports.CONFIG_NS_APP_RESOURCES_ENTRY = exports.CONFIG_NS_FILE_NAME = exports.RESOURCES_DIR = exports.BUNDLE_DIR = exports.APK_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.WEBPACK_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 = void 0;
+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.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";
@@ -16,6 +16,7 @@ exports.SCOPED_TNS_CORE_MODULES = "@nativescript/core";
 exports.TNS_CORE_THEME_NAME = "nativescript-theme-core";
 exports.SCOPED_TNS_CORE_THEME_NAME = "@nativescript/theme";
 exports.WEBPACK_PLUGIN_NAME = "@nativescript/webpack";
+exports.RSPACK_PLUGIN_NAME = "@nativescript/rspack";
 exports.TNS_CORE_MODULES_WIDGETS_NAME = "tns-core-modules-widgets";
 exports.UI_MOBILE_BASE_NAME = "@nativescript/ui-mobile-base";
 exports.TNS_ANDROID_RUNTIME_NAME = "tns-android";
@@ -36,6 +37,7 @@ exports.XML_FILE_EXTENSION = ".xml";
 exports.PLATFORMS_DIR_NAME = "platforms";
 exports.HOOKS_DIR_NAME = "hooks";
 exports.WEBPACK_CONFIG_NAME = "webpack.config.js";
+exports.RSPACK_CONFIG_NAME = "rspack.config.js";
 exports.TSCCONFIG_TNS_JSON_NAME = "tsconfig.tns.json";
 exports.KARMA_CONFIG_NAME = "karma.conf.js";
 exports.LIB_DIR_NAME = "lib";
@@ -215,7 +217,7 @@ exports.CACACHE_DIRECTORY_NAME = "_cacache";
 exports.FILES_CHANGE_EVENT_NAME = "filesChangeEvent";
 exports.INITIAL_SYNC_EVENT_NAME = "initialSyncEvent";
 exports.PREPARE_READY_EVENT_NAME = "prepareReadyEvent";
-exports.WEBPACK_COMPILATION_COMPLETE = "webpackCompilationComplete";
+exports.BUNDLER_COMPILATION_COMPLETE = "bundlerCompilationComplete";
 class DebugCommandErrors {
 }
 exports.DebugCommandErrors = DebugCommandErrors;
@@ -309,6 +311,7 @@ var IOSNativeTargetTypes;
     IOSNativeTargetTypes["watchApp"] = "watch_app";
     IOSNativeTargetTypes["watchExtension"] = "watch_extension";
     IOSNativeTargetTypes["appExtension"] = "app_extension";
+    IOSNativeTargetTypes["application"] = "application";
 })(IOSNativeTargetTypes || (exports.IOSNativeTargetTypes = IOSNativeTargetTypes = {}));
 const pathToLoggerAppendersDir = (0, path_1.join)(__dirname, "common", "logger", "appenders");
 exports.LoggerAppenders = {

package/lib/controllers/migrate-controller.js

@@ -10,7 +10,8 @@ const simple_git_1 = require("simple-git");
 const update_controller_base_1 = require("./update-controller-base");
 const helpers_1 = require("../common/helpers");
 const yok_1 = require("../common/yok");
-const temp = require("temp");
+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, $projectData, $options, $resources, $injector, $settingsService, $staticConfig, $terminalSpinnerService, $projectCleanupService, $projectBackupService, $childProcess) {
@@ -711,9 +712,7 @@ class MigrateController extends update_controller_base_1.UpdateControllerBase {
         if (polyfillsPath) {
             return "./" + path.relative(projectDir, polyfillsPath);
         }
-        const tempDir = temp.mkdirSync({
-            prefix: "migrate-angular-polyfills",
-        });
+        const tempDir = fs.mkdtempSync(path.join((0, os_1.tmpdir)(), "migrate-angular-polyfills-"));
         await this.$pacoteService.extractPackage(constants.RESERVED_TEMPLATE_NAMES["angular"], tempDir);
         this.$fs.copyFile(path.resolve(tempDir, "src/polyfills.ts"), possiblePaths[0]);
         this.$fs.deleteDirectory(tempDir);

package/lib/controllers/prepare-controller.js

@@ -17,7 +17,7 @@ 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, $webpackCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
+    constructor($platformController, $hooksService, $fs, $logger, $options, $mobileHelper, $nodeModulesDependenciesBuilder, $platformsDataService, $pluginsService, $prepareNativePlatformService, $projectChangesService, $projectDataService, $bundlerCompilerService, $watchIgnoreListService, $analyticsService, $markingModeService, $projectConfigService, $projectService) {
         super();
         this.$platformController = $platformController;
         this.$hooksService = $hooksService;
@@ -31,7 +31,7 @@ class PrepareController extends events_1.EventEmitter {
         this.$prepareNativePlatformService = $prepareNativePlatformService;
         this.$projectChangesService = $projectChangesService;
         this.$projectDataService = $projectDataService;
-        this.$webpackCompilerService = $webpackCompilerService;
+        this.$bundlerCompilerService = $bundlerCompilerService;
         this.$watchIgnoreListService = $watchIgnoreListService;
         this.$analyticsService = $analyticsService;
         this.$markingModeService = $markingModeService;
@@ -67,8 +67,8 @@ class PrepareController extends events_1.EventEmitter {
             this.watchersData[projectDir] &&
             this.watchersData[projectDir][platformLowerCase] &&
             this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess) {
-            await this.$webpackCompilerService.stopWebpackCompiler(platformLowerCase);
-            this.$webpackCompilerService.removeListener(constants_1.WEBPACK_COMPILATION_COMPLETE, this.webpackCompilerHandler);
+            await this.$bundlerCompilerService.stopBundlerCompiler(platformLowerCase);
+            this.$bundlerCompilerService.removeListener(constants_1.BUNDLER_COMPILATION_COMPLETE, this.webpackCompilerHandler);
             this.watchersData[projectDir][platformLowerCase].hasWebpackCompilerProcess = false;
         }
     }
@@ -90,7 +90,7 @@ class PrepareController extends events_1.EventEmitter {
             result = await this.startWatchersWithPrepare(platformData, projectData, prepareData);
         }
         else {
-            await this.$webpackCompilerService.compileWithoutWatch(platformData, projectData, prepareData);
+            await this.$bundlerCompilerService.compileWithoutWatch(platformData, projectData, prepareData);
             const hasNativeChanges = await this.$prepareNativePlatformService.prepareNativePlatform(platformData, projectData, prepareData);
             result = {
                 hasNativeChanges,
@@ -155,9 +155,9 @@ class PrepareController extends events_1.EventEmitter {
                 }
             };
             this.webpackCompilerHandler = handler.bind(this);
-            this.$webpackCompilerService.on(constants_1.WEBPACK_COMPILATION_COMPLETE, this.webpackCompilerHandler);
+            this.$bundlerCompilerService.on(constants_1.BUNDLER_COMPILATION_COMPLETE, this.webpackCompilerHandler);
             this.watchersData[projectData.projectDir][platformData.platformNameLowerCase].hasWebpackCompilerProcess = true;
-            await this.$webpackCompilerService.compileWithWatch(platformData, projectData, prepareData);
+            await this.$bundlerCompilerService.compileWithWatch(platformData, projectData, prepareData);
         }
     }
     async startNativeWatcherWithPrepare(platformData, projectData, prepareData) {
@@ -334,7 +334,7 @@ class PrepareController extends events_1.EventEmitter {
         if (this.pausedFileWatch) {
             for (const watcher of watchers) {
                 for (const platform in watcher) {
-                    await this.$webpackCompilerService.stopWebpackCompiler(platform);
+                    await this.$bundlerCompilerService.stopBundlerCompiler(platform);
                     watcher[platform].hasWebpackCompilerProcess = false;
                 }
             }
@@ -344,7 +344,7 @@ class PrepareController extends events_1.EventEmitter {
                 for (const platform in watcher) {
                     const args = watcher[platform].prepareArguments;
                     watcher[platform].hasWebpackCompilerProcess = true;
-                    await this.$webpackCompilerService.compileWithWatch(args.platformData, args.projectData, args.prepareData);
+                    await this.$bundlerCompilerService.compileWithWatch(args.platformData, args.projectData, args.prepareData);
                 }
             }
         }

package/lib/controllers/run-controller.js

@@ -60,7 +60,7 @@ class RunController extends events_1.EventEmitter {
                 if (data.hasNativeChanges) {
                     const platformData = this.$platformsDataService.getPlatformData(data.platform, projectData);
                     const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, data.platform, { ...liveSyncInfo, watch: !liveSyncInfo.skipWatcher });
-                    const changesInfo = await this.$projectChangesService.checkForChanges(platformData, projectData, prepareData, data);
+                    const changesInfo = await this.$projectChangesService.checkForChanges(platformData, projectData, prepareData);
                     if (changesInfo.hasChanges) {
                         await this.syncChangedDataOnDevices(data, projectData, platformData, liveSyncInfo);
                     }

package/lib/declarations.d.ts

@@ -594,8 +594,13 @@ interface IIOSOptions extends IEmbedOptions {}
 
 interface ITypingsOptions {
 	jar: string;
+	dtsGeneratorPath: string;
 	aar: string;
 	filter: string;
+	dtsGeneratorPath: string;
+	lookupPath: string;
+	super: string;
+	skipDeclarations: boolean;
 }
 
 interface IOptions

package/lib/definitions/hooks.d.ts

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

package/lib/definitions/nativescript-dev-xcode.d.ts

@@ -8,16 +8,27 @@ declare module "nativescript-dev-xcode" {
 	}
 
 	class project {
+		hash: any;
+		filepath: string;
 		constructor(filename: string);
 
 		parse(callback: () => void): void;
 		parseSync(): void;
 
+		generateUuid(): string;
+
 		writeSync(options: any): string;
 
 		addFramework(filepath: string, options?: Options): void;
 		removeFramework(filePath: string, options?: Options): void;
 
+
+		getProductFile(watchApptarget: target): any;
+		addToPbxFrameworksBuildPhase(file);
+		addToPbxCopyfilesBuildPhase(file, comment: string, targetid: string);
+		pbxFrameworksBuildPhaseObj(targetid: string): any;
+		pbxBuildFileSection(): {[k: string] : any};
+
 		addPbxGroup(
 			filePathsArray: any[],
 			name: string,
@@ -27,17 +38,30 @@ declare module "nativescript-dev-xcode" {
 
 		removePbxGroup(groupName: string, path: string): void;
 
+		addTargetDependency(target: string, dependencyTargets: string[]);
+
+		findTargetKey(name: string);
+		pbxTargetByName(name: string): target;
+		pbxNativeTargetSection(): {[key: string]: any};
+
 		addToHeaderSearchPaths(options?: Options): void;
 		removeFromHeaderSearchPaths(options?: Options): void;
 		updateBuildProperty(key: string, value: any): void;
 
 		pbxXCBuildConfigurationSection(): any;
 
+		buildPhaseObject(
+			buildPhaseType: string,
+			comment: string,
+			target: tstring
+		)
+
 		addTarget(
 			targetName: string,
 			targetType: string,
 			targetPath?: string,
-			parentTarget?: string
+			parentTarget?: string,
+			productTargetType?: string
 		): target;
 		addBuildPhase(
 			filePathsArray: string[],

package/lib/definitions/project.d.ts

@@ -121,6 +121,7 @@ export interface IOSLocalSPMPackage extends IOSSPMPackageBase {
 }
 
 export type IOSSPMPackage = IOSRemoteSPMPackage | IOSLocalSPMPackage;
+export type BundlerType = "webpack" | "rspack" | "vite";
 
 interface INsConfigIOS extends INsConfigPlaform {
 	discardUncaughtJsExceptions?: boolean;
@@ -194,12 +195,15 @@ interface INsConfig {
 	overridePods?: string;
 	webpackPackageName?: string;
 	webpackConfigPath?: string;
+	bundlerConfigPath?: string;
+	bundler?: BundlerType;
 	ios?: INsConfigIOS;
 	android?: INsConfigAndroid;
 	visionos?: INSConfigVisionOS;
 	ignoredNativeDependencies?: string[];
 	hooks?: INsConfigHooks[];
 	projectName?: string;
+	corePackageName?: string;
 }
 
 interface IProjectData extends ICreateProjectData {
@@ -227,13 +231,28 @@ interface IProjectData extends ICreateProjectData {
 	 * Value is true when project has nativescript.config and it has `shared: true` in it.
 	 */
 	isShared: boolean;
-
 	/**
+	 * Specifies the bundler used to build the application.
+	 *
+	 * - `"webpack"`: Uses Webpack for traditional bundling.
+	 * - `"rspack"`: Uses Rspack for fast bundling.
+	 * - `"vite"`: Uses Vite for fast bundling.
+	 *
+	 * @default "webpack"
+	 */
+	bundler: BundlerType;
+	/**
+	 * @deprecated Use bundlerConfigPath
 	 * Defines the path to the configuration file passed to webpack process.
 	 * By default this is the webpack.config.js at the root of the application.
 	 * The value can be changed by setting `webpackConfigPath` in nativescript.config.
 	 */
 	webpackConfigPath: string;
+	/**
+	 * Defines the path to the bundler configuration file passed to the compiler.
+	 * The value can be changed by setting `bundlerConfigPath` in nativescript.config.
+	 */
+	bundlerConfigPath: string;
 	projectName: string;
 
 	/**
@@ -868,6 +887,38 @@ interface IRemoveExtensionsOptions {
 
 interface IRemoveWatchAppOptions extends IRemoveExtensionsOptions {}
 
+interface IWatchAppJSONConfigModule {
+	name?: string;
+	path: string;
+	targetType?: string;
+	embed?: boolean;
+	frameworks?: Array<string | Record<string, string>>;
+	dependencies?: string[];
+	headerSearchPaths?: string[];
+	resources?: string[];
+	src?: string[];
+	linkerFlags?: string[];
+	buildConfigurationProperties?: Record<string, string>;
+	SPMPackages?: Array<IOSSPMPackage | string>;
+}
+interface IWatchAppJSONConfig {
+	targetType?: string;
+	forceAddEmbedWatchContent?: boolean;
+	sharedModulesBuildConfigurationProperties?: Record<string, string>;
+	basedir?: string;
+	infoPlistPath?: string;
+	xcprivacyPath?: string;
+	importSourcesFromMainFolder?: boolean;
+	importResourcesFromMainFolder?: boolean;
+	resources?: string[];
+	src?: string[];
+	resourcesExclude?: string[];
+	srcExclude?: string[];
+	modules: IWatchAppConfigModule[];
+	SPMPackages?: Array<IOSSPMPackage>;
+}
+
+
 interface IRubyFunction {
 	functionName: string;
 	functionParameters?: string;

package/lib/definitions/temp-service.d.ts

@@ -1,9 +1,13 @@
-import { AffixOptions } from "temp";
+export type AffixOptions = {
+	prefix?: string;
+	suffix?: string;
+	dir?: string;
+};
 
 /**
  * Declares wrapped functions of temp module
  */
-interface ITempService {
+export interface ITempService {
 	mkdirSync(affixes: string | AffixOptions): Promise<string>;
 	path(options: string | AffixOptions): Promise<string>;
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const color_1 = require("../color");
+const node_util_1 = require("node:util");
 const yok_1 = require("../common/yok");
 class KeyCommandHelper {
     constructor() {
@@ -33,7 +34,7 @@ class KeyCommandHelper {
                         }
                         if (keyCommand.key !== "\u0003") {
                             const line = ` ${color_1.color.dim("→")} ${color_1.color.bold(keyCommand.key)} — ${keyCommand.description}`;
-                            const lineLength = (0, color_1.stripColors)(line).length - 1;
+                            const lineLength = (0, node_util_1.stripVTControlCharacters)(line).length - 1;
                             console.log(color_1.color.dim(` ┌${"─".repeat(lineLength)}┐`));
                             console.log(line + color_1.color.dim(" │"));
                             console.log(color_1.color.dim(` └${"─".repeat(lineLength)}┘`));

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

@@ -220,7 +220,11 @@ class Options {
             appleSessionBase64: { type: "string", hasSensitiveValue: true },
             jar: { type: "string", hasSensitiveValue: true },
             aar: { type: "string", hasSensitiveValue: true },
+            dtsGeneratorPath: { type: "string", hasSensitiveValue: true },
             filter: { type: "string", hasSensitiveValue: true },
+            lookupPath: { type: "string", hasSensitiveValue: true },
+            super: { type: "string", hasSensitiveValue: true },
+            skipDeclarations: { type: "boolean", hasSensitiveValue: false },
             git: {
                 type: "boolean",
                 hasSensitiveValue: false,

package/lib/project-data.js

@@ -56,6 +56,7 @@ class ProjectData {
         this.errorInvalidProject(projectDir);
     }
     initializeProjectDataFromContent(packageJsonContent, projectDir) {
+        var _a, _b;
         projectDir = projectDir || this.$projectHelper.projectDir || "";
         this.projectDir = projectDir;
         const projectFilePath = this.getProjectFilePath(projectDir);
@@ -92,10 +93,15 @@ class ProjectData {
             this.buildXcconfigPath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.BUILD_XCCONFIG_FILE_NAME);
             this.podfilePath = path.join(this.appResourcesDirectoryPath, this.$devicePlatformsConstants.iOS, constants.PODFILE_NAME);
             this.isShared = !!(this.nsConfig && this.nsConfig.shared);
-            this.webpackConfigPath =
-                this.nsConfig && this.nsConfig.webpackConfigPath
-                    ? path.resolve(this.projectDir, this.nsConfig.webpackConfigPath)
-                    : path.join(this.projectDir, "webpack.config.js");
+            const webpackConfigPath = this.nsConfig && this.nsConfig.webpackConfigPath
+                ? path.resolve(this.projectDir, this.nsConfig.webpackConfigPath)
+                : path.join(this.projectDir, "webpack.config.js");
+            this.webpackConfigPath = webpackConfigPath;
+            this.bundlerConfigPath =
+                this.nsConfig && this.nsConfig.bundlerConfigPath
+                    ? path.resolve(this.projectDir, this.nsConfig.bundlerConfigPath)
+                    : webpackConfigPath;
+            this.bundler = (_b = (_a = this === null || this === void 0 ? void 0 : this.nsConfig) === null || _a === void 0 ? void 0 : _a.bundler) !== null && _b !== void 0 ? _b : "webpack";
             return;
         }
         this.errorInvalidProject(projectDir);

package/lib/services/analytics/analytics-broker-process.js

@@ -44,7 +44,7 @@ process.on("message", async (data) => {
             analyticsLoggingService.logData({
                 message: `analytics-broker-process will send ${"ProcessFinishedTasks"} message`,
             });
-            process.send("ProcessFinishedTasks", () => {
+            process.send("ProcessFinishedTasks", null, null, () => {
                 analyticsLoggingService.logData({
                     message: `analytics-broker-process sent ${"ProcessFinishedTasks"} message and will exit gracefully now`,
                 });

package/lib/services/analytics-settings-service.js

@@ -29,7 +29,8 @@ class AnalyticsSettingsService {
         return this.getSettingValueOrDefault(this.$staticConfig.ANALYTICS_INSTALLATION_ID_SETTING_NAME);
     }
     getClientName() {
-        return "" + color_1.color.cyan.bold(this.$staticConfig.CLIENT_NAME_ALIAS);
+        return ("" +
+            color_1.color.styleText(["cyan", "bold"], this.$staticConfig.CLIENT_NAME_ALIAS));
     }
     async getUserSessionsCount(projectName) {
         const sessionsCountForProject = await this.$userSettingsService.getSettingValue(this.getSessionsProjectKey(projectName));

package/lib/services/android/gradle-build-args-service.js

@@ -4,6 +4,7 @@ exports.GradleBuildArgsService = void 0;
 const path = require("path");
 const constants_1 = require("../../common/constants");
 const yok_1 = require("../../common/yok");
+const constants_2 = require("../../constants");
 class GradleBuildArgsService {
     constructor($androidToolsInfo, $hooksService, $analyticsService, $staticConfig, $projectData, $logger) {
         this.$androidToolsInfo = $androidToolsInfo;
@@ -45,17 +46,20 @@ class GradleBuildArgsService {
             args.push(...additionalArgs);
         }
         if (buildData.release) {
-            args.push("-Prelease", `-PksPath=${path.resolve(buildData.keyStorePath)}`, `-Palias=${buildData.keyStoreAlias}`, `-Ppassword=${buildData.keyStoreAliasPassword}`, `-PksPassword=${buildData.keyStorePassword}`);
+            args.push("-Prelease");
+        }
+        if (buildData.release || buildData.keyStorePath) {
+            args.push(`-PksPath=${path.resolve(buildData.keyStorePath)}`, `-Palias=${buildData.keyStoreAlias}`, `-Ppassword=${buildData.keyStoreAliasPassword}`, `-PksPassword=${buildData.keyStorePassword}`);
         }
         return args;
     }
     getBuildLoggingArgs() {
         const args = [];
         const logLevel = this.$logger.getLevel();
-        if (logLevel === "TRACE") {
+        if (logLevel === constants_2.LoggerLevel.TRACE) {
             args.push("--debug");
         }
-        else if (logLevel === "INFO") {
+        else if (logLevel === constants_2.LoggerLevel.DEBUG) {
             args.push("--info");
         }
         return args;