nativescript 8.5.3 → 8.5.4-dev.0

package/lib/commands/test-init.js

@@ -14,6 +14,7 @@ const _ = require("lodash");
 const constants_1 = require("../constants");
 const helpers_1 = require("../common/helpers");
 const yok_1 = require("../common/yok");
+const color_1 = require("../color");
 class TestInitCommand {
     constructor($packageManager, $projectData, $errors, $options, $prompter, $fs, $resources, $pluginsService, $logger, $testInitializationService) {
         this.$packageManager = $packageManager;
@@ -99,11 +100,11 @@ class TestInitCommand {
             let shouldCreateSampleTests = true;
             if (this.$fs.exists(testsDir)) {
                 const specFilenamePattern = `<filename>.spec${projectFilesExtension}`;
-                bufferedLogs.push([
+                bufferedLogs.push(color_1.color.yellow([
                     `Note: The "${projectTestsDir}" directory already exists, will not create example tests in the project.`,
                     `You may create "${specFilenamePattern}" files anywhere you'd like.`,
                     "",
-                ].join("\n").yellow);
+                ].join("\n")));
                 shouldCreateSampleTests = false;
             }
             this.$fs.ensureDirectoryExists(testsDir);
@@ -124,42 +125,40 @@ class TestInitCommand {
             if (shouldCreateSampleTests && this.$fs.exists(exampleFilePath)) {
                 this.$fs.copyFile(exampleFilePath, targetExampleTestPath);
                 const targetExampleTestRelativePath = path.relative(projectDir, targetExampleTestPath);
-                bufferedLogs.push(`Added example test: ${targetExampleTestRelativePath.yellow}`);
+                bufferedLogs.push(`Added example test: ${color_1.color.yellow(targetExampleTestRelativePath)}`);
             }
             const testMainResourcesPath = this.$resources.resolvePath(`test/test-main${projectFilesExtension}`);
             const testMainPath = path.join(this.$projectData.appDirectoryPath, `test${projectFilesExtension}`);
             if (!this.$fs.exists(testMainPath)) {
                 this.$fs.copyFile(testMainResourcesPath, testMainPath);
                 const testMainRelativePath = path.relative(projectDir, testMainPath);
-                bufferedLogs.push(`Main test entrypoint created: ${testMainRelativePath.yellow}`);
+                bufferedLogs.push(`Main test entrypoint created: ${color_1.color.yellow(testMainRelativePath)}`);
             }
             const testTsConfigTemplate = this.$resources.readText("test/tsconfig.spec.json");
             const testTsConfig = _.template(testTsConfigTemplate)({
                 basePath: this.$projectData.getAppDirectoryRelativePath(),
             });
             this.$fs.writeFile(path.join(projectDir, "tsconfig.spec.json"), testTsConfig);
-            bufferedLogs.push(`Added/replaced ${"tsconfig.spec.json".yellow}`);
-            const greyDollarSign = "$".grey;
+            bufferedLogs.push(`Added/replaced ${color_1.color.yellow("tsconfig.spec.json")}`);
+            const greyDollarSign = color_1.color.grey("$");
             this.$logger.info([
                 [
-                    `Tests using`.green,
-                    frameworkToInstall.cyan,
-                    `were successfully initialized.`.green,
+                    color_1.color.green(`Tests using`),
+                    color_1.color.cyan(frameworkToInstall),
+                    color_1.color.green(`were successfully initialized.`),
                 ].join(" "),
                 "",
                 ...bufferedLogs,
                 "",
-                `Note: @nativescript/unit-test-runner was included in "dependencies" as a convenience to automatically adjust your app's Info.plist on iOS and AndroidManifest.xml on Android to ensure the socket connects properly.`
-                    .yellow,
+                color_1.color.yellow(`Note: @nativescript/unit-test-runner was included in "dependencies" as a convenience to automatically adjust your app's Info.plist on iOS and AndroidManifest.xml on Android to ensure the socket connects properly.`),
                 "",
-                `For production you may want to move to "devDependencies" and manage the settings yourself.`
-                    .yellow,
+                color_1.color.yellow(`For production you may want to move to "devDependencies" and manage the settings yourself.`),
                 "",
                 "",
                 `You can now run your tests:`,
                 "",
-                `  ${greyDollarSign} ${"ns test ios".green}`,
-                `  ${greyDollarSign} ${"ns test android".green}`,
+                `  ${greyDollarSign} ${color_1.color.green("ns test ios")}`,
+                `  ${greyDollarSign} ${color_1.color.green("ns test android")}`,
                 "",
             ].join("\n"));
         });

package/lib/commands/test.js

@@ -70,9 +70,6 @@ class TestCommandBase {
                 platform: this.platform,
                 projectDir: this.$projectData.projectDir,
                 options: this.$options,
-                notConfiguredEnvOptions: {
-                    hideSyncToPreviewAppOption: true,
-                },
             });
             const canStartKarmaServer = yield this.$testExecutionService.canStartKarmaServer(this.$projectData);
             if (!canStartKarmaServer) {

package/lib/commands/update.js

@@ -64,7 +64,7 @@ class UpdateCommand {
         });
     }
 }
-exports.UpdateCommand = UpdateCommand;
 UpdateCommand.SHOULD_MIGRATE_PROJECT_MESSAGE = 'This project is not compatible with the current NativeScript version and cannot be updated. Use "ns migrate" to make your project compatible.';
 UpdateCommand.PROJECT_UP_TO_DATE_MESSAGE = "This project is up to date.";
+exports.UpdateCommand = UpdateCommand;
 yok_1.injector.registerCommand("update", UpdateCommand);

package/lib/common/bootstrap.js

@@ -4,7 +4,6 @@ const yok_1 = require("./yok");
 const _ = require("lodash");
 global._ = _;
 global.$injector = yok_1.injector;
-require("colors");
 yok_1.injector.require("errors", "./errors");
 yok_1.injector.requirePublic("fs", "./file-system");
 yok_1.injector.require("hostInfo", "./host-info");

package/lib/common/child-process.js

@@ -44,7 +44,7 @@ class ChildProcess extends events_1.EventEmitter {
     }
     execFile(command, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.$logger.debug("execFile: %s %s", command, this.getArgumentsAsQuotedString(args));
+            this.$logger.trace("execFile: %s %s", command, this.getArgumentsAsQuotedString(args));
             return new Promise((resolve, reject) => {
                 child_process.execFile(command, args, (error, stdout) => {
                     if (error) {
@@ -63,11 +63,11 @@ class ChildProcess extends events_1.EventEmitter {
             const cwd = (_a = options === null || options === void 0 ? void 0 : options.cwd) !== null && _a !== void 0 ? _a : process.cwd();
             command = (0, path_1.resolve)(cwd, command);
         }
-        this.$logger.debug("spawn: %s %s", command, this.getArgumentsAsQuotedString(args));
+        this.$logger.trace("spawn: %s %s", command, this.getArgumentsAsQuotedString(args));
         return child_process.spawn(command, args, options);
     }
     fork(modulePath, args, options) {
-        this.$logger.debug("fork: %s %s", modulePath, this.getArgumentsAsQuotedString(args));
+        this.$logger.trace("fork: %s %s", modulePath, this.getArgumentsAsQuotedString(args));
         return child_process.fork(modulePath, args, options);
     }
     spawnFromEvent(command, args, event, options, spawnFromEventOptions) {

package/lib/common/codeGeneration/code-printer.js

@@ -40,9 +40,9 @@ class CodePrinter {
         return content;
     }
 }
-exports.CodePrinter = CodePrinter;
 CodePrinter.INDENT_CHAR = "\t";
 CodePrinter.NEW_LINE_CHAR = os_1.EOL;
 CodePrinter.START_BLOCK_CHAR = " {";
 CodePrinter.END_BLOCK_CHAR = "}";
+exports.CodePrinter = CodePrinter;
 yok_1.injector.register("swaggerCodePrinter", CodePrinter);

package/lib/common/commands/device/device-log-stream.js

@@ -39,6 +39,6 @@ class OpenDeviceLogStreamCommand {
         });
     }
 }
-exports.OpenDeviceLogStreamCommand = OpenDeviceLogStreamCommand;
 OpenDeviceLogStreamCommand.NOT_SPECIFIED_DEVICE_ERROR_MESSAGE = "More than one device found. Specify device explicitly.";
+exports.OpenDeviceLogStreamCommand = OpenDeviceLogStreamCommand;
 yok_1.injector.registerCommand(["device|log", "devices|log"], OpenDeviceLogStreamCommand);

package/lib/common/commands/device/list-devices.js

@@ -13,6 +13,7 @@ exports.ListDevicesCommand = void 0;
 const helpers_1 = require("../../helpers");
 const constants_1 = require("../../../constants");
 const yok_1 = require("../../yok");
+const color_1 = require("../../../color");
 class ListDevicesCommand {
     constructor($devicesService, $errors, $emulatorHelper, $logger, $stringParameter, $mobileHelper, $options) {
         this.$devicesService = $devicesService;
@@ -38,12 +39,10 @@ class ListDevicesCommand {
                 const emulators = this.$emulatorHelper.getEmulatorsFromAvailableEmulatorsOutput(availableEmulatorsOutput);
                 devices.available = emulators;
                 if (!this.$options.json) {
-                    this.printEmulators("\nAvailable emulators", emulators);
+                    this.$logger.info(color_1.color.bold("\n Available emulators"));
+                    this.printEmulators(emulators);
                 }
             }
-            if (!this.$options.json) {
-                this.$logger.info("\nConnected devices & emulators");
-            }
             let index = 1;
             yield this.$devicesService.initialize({
                 platform: args[0],
@@ -53,6 +52,9 @@ class ListDevicesCommand {
                 skipEmulatorStart: true,
                 fullDiscovery: true,
             });
+            if (!this.$options.json) {
+                this.$logger.info(color_1.color.bold("\n Connected devices & emulators"));
+            }
             const table = (0, helpers_1.createTable)([
                 "#",
                 "Device Name",
@@ -94,15 +96,13 @@ class ListDevicesCommand {
             }
         });
     }
-    printEmulators(title, emulators) {
-        this.$logger.info(title);
+    printEmulators(emulators) {
         const table = (0, helpers_1.createTable)([
             "Device Name",
             "Platform",
             "Version",
             "Device Identifier",
             "Image Identifier",
-            "Error Help",
         ], []);
         for (const info of emulators) {
             table.push([
@@ -111,7 +111,6 @@ class ListDevicesCommand {
                 info.version,
                 info.identifier || "",
                 info.imageIdentifier || "",
-                info.errorHelp || "",
             ]);
         }
         this.$logger.info(table.toString());

package/lib/common/commands/generate-messages.js

@@ -39,7 +39,7 @@ class GenerateMessages {
         });
     }
 }
-exports.GenerateMessages = GenerateMessages;
 GenerateMessages.MESSAGES_DEFINITIONS_FILE_NAME = "messages.interface.d.ts";
 GenerateMessages.MESSAGES_IMPLEMENTATION_FILE_NAME = "messages.ts";
+exports.GenerateMessages = GenerateMessages;
 yok_1.injector.registerCommand("dev-generate-messages", GenerateMessages);

package/lib/common/constants.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SOCKET_CONNECTION_TIMEOUT_MS = exports.AndroidVirtualDevice = exports.ATTACH_REQUEST_EVENT_NAME = exports.DEBUGGER_PORT_FOUND_EVENT_NAME = exports.DEFAULT_CHUNK_SIZE = exports.HttpProtocolToPort = exports.HttpStatusCodes = exports.Proxy = exports.IOS_RELAY_NOTIFICATION_COMMAND_TYPE = exports.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE = exports.IOS_POST_NOTIFICATION_COMMAND_TYPE = exports.FileExtensions = exports.TNS_CORE_MODULES = exports.NODE_MODULES_DIR_NAME = exports.Configurations = exports.TARGET_FRAMEWORK_IDENTIFIERS = exports.FAIL_LIVESYNC_LOG_REGEX = exports.IOS_APP_CRASH_LOG_REG_EXP = exports.IOS_LOG_PREDICATE = exports.DEVICE_LOG_EVENT_NAME = exports.EmulatorDiscoveryNames = exports.DeviceDiscoveryEventNames = exports.HmrConstants = exports.LiveSyncPaths = exports.APPLE_VENDOR_NAME = exports.NOT_RUNNING_EMULATOR_STATUS = exports.RUNNING_EMULATOR_STATUS = exports.CONNECTED_STATUS = exports.UNREACHABLE_STATUS = exports.ERROR_NO_VALID_SUBCOMMAND_FORMAT = exports.ERROR_CANNOT_RESOLVE_DEVICE = exports.ERROR_NO_DEVICES_CANT_USE_IOS_SIMULATOR = exports.ERROR_CANT_USE_SIMULATOR = exports.ERROR_NO_DEVICES = exports.APP_RESOURCES_FOLDER_NAME = exports.DeviceTypes = exports.ProvisionType = void 0;
 class ProvisionType {
 }
-exports.ProvisionType = ProvisionType;
 ProvisionType.Development = "Development";
 ProvisionType.AdHoc = "AdHoc";
 ProvisionType.AppStore = "AppStore";
 ProvisionType.Enterprise = "Enterprise";
+exports.ProvisionType = ProvisionType;
 class DeviceTypes {
 }
-exports.DeviceTypes = DeviceTypes;
 DeviceTypes.Emulator = "Emulator";
 DeviceTypes.Simulator = "Simulator";
 DeviceTypes.Device = "Device";
+exports.DeviceTypes = DeviceTypes;
 exports.APP_RESOURCES_FOLDER_NAME = "App_Resources";
 exports.ERROR_NO_DEVICES = "Cannot find connected devices. Reconnect any connected devices, verify that your system recognizes them, and run this command again.";
 exports.ERROR_CANT_USE_SIMULATOR = "You can use iOS simulator only on OS X.";
@@ -27,29 +27,29 @@ exports.NOT_RUNNING_EMULATOR_STATUS = "Not running";
 exports.APPLE_VENDOR_NAME = "Apple";
 class LiveSyncPaths {
 }
-exports.LiveSyncPaths = LiveSyncPaths;
 LiveSyncPaths.SYNC_DIR_NAME = "sync";
 LiveSyncPaths.REMOVEDSYNC_DIR_NAME = "removedsync";
 LiveSyncPaths.FULLSYNC_DIR_NAME = "fullsync";
 LiveSyncPaths.IOS_DEVICE_PROJECT_ROOT_PATH = "Library/Application Support/LiveSync";
 LiveSyncPaths.IOS_DEVICE_SYNC_ZIP_PATH = "Library/Application Support/LiveSync/sync.zip";
 LiveSyncPaths.ANDROID_TMP_DIR_NAME = "/data/local/tmp";
+exports.LiveSyncPaths = LiveSyncPaths;
 class HmrConstants {
 }
-exports.HmrConstants = HmrConstants;
 HmrConstants.HMR_ERROR_STATUS = 3;
 HmrConstants.HMR_SUCCESS_STATUS = 2;
+exports.HmrConstants = HmrConstants;
 class DeviceDiscoveryEventNames {
 }
-exports.DeviceDiscoveryEventNames = DeviceDiscoveryEventNames;
 DeviceDiscoveryEventNames.DEVICE_FOUND = "deviceFound";
 DeviceDiscoveryEventNames.DEVICE_UPDATED = "deviceUpdated";
 DeviceDiscoveryEventNames.DEVICE_LOST = "deviceLost";
+exports.DeviceDiscoveryEventNames = DeviceDiscoveryEventNames;
 class EmulatorDiscoveryNames {
 }
-exports.EmulatorDiscoveryNames = EmulatorDiscoveryNames;
 EmulatorDiscoveryNames.EMULATOR_IMAGE_FOUND = "emulatorImageFound";
 EmulatorDiscoveryNames.EMULATOR_IMAGE_LOST = "emulatorImageLost";
+exports.EmulatorDiscoveryNames = EmulatorDiscoveryNames;
 exports.DEVICE_LOG_EVENT_NAME = "deviceLogData";
 exports.IOS_LOG_PREDICATE = 'senderImagePath contains "NativeScript"';
 exports.IOS_APP_CRASH_LOG_REG_EXP = /Fatal JavaScript exception \- application has been terminated/;
@@ -60,36 +60,36 @@ exports.TARGET_FRAMEWORK_IDENTIFIERS = {
 };
 class Configurations {
 }
-exports.Configurations = Configurations;
 Configurations.Debug = "Debug";
 Configurations.Release = "Release";
+exports.Configurations = Configurations;
 exports.NODE_MODULES_DIR_NAME = "node_modules";
 exports.TNS_CORE_MODULES = "tns-core-modules";
 class FileExtensions {
 }
-exports.FileExtensions = FileExtensions;
 FileExtensions.TYPESCRIPT_DEFINITION_FILE = ".d.ts";
 FileExtensions.TYPESCRIPT_FILE = ".ts";
 FileExtensions.PNG_FILE = ".png";
 FileExtensions.NINE_PATCH_PNG_FILE = ".9.png";
+exports.FileExtensions = FileExtensions;
 exports.IOS_POST_NOTIFICATION_COMMAND_TYPE = "PostNotification";
 exports.IOS_OBSERVE_NOTIFICATION_COMMAND_TYPE = "ObserveNotification";
 exports.IOS_RELAY_NOTIFICATION_COMMAND_TYPE = "RelayNotification";
 class Proxy {
 }
-exports.Proxy = Proxy;
 Proxy.CACHE_FILE_NAME = "proxy-cache.json";
 Proxy.USE_PROXY = "USE_PROXY";
 Proxy.PROXY_PORT = "PROXY_PORT";
 Proxy.PROXY_HOSTNAME = "PROXY_HOSTNAME";
+exports.Proxy = Proxy;
 class HttpStatusCodes {
 }
-exports.HttpStatusCodes = HttpStatusCodes;
 HttpStatusCodes.SEE_OTHER = 303;
 HttpStatusCodes.NOT_MODIFIED = 304;
 HttpStatusCodes.PAYMENT_REQUIRED = 402;
 HttpStatusCodes.PROXY_AUTHENTICATION_REQUIRED = 407;
 HttpStatusCodes.CONFLICTING_RESOURCE = 409;
+exports.HttpStatusCodes = HttpStatusCodes;
 exports.HttpProtocolToPort = {
     "http:": 80,
     "https:": 443,
@@ -99,7 +99,6 @@ exports.DEBUGGER_PORT_FOUND_EVENT_NAME = "DEBUGGER_PORT_FOUND";
 exports.ATTACH_REQUEST_EVENT_NAME = "ATTACH_REQUEST";
 class AndroidVirtualDevice {
 }
-exports.AndroidVirtualDevice = AndroidVirtualDevice;
 AndroidVirtualDevice.ANDROID_DIR_NAME = ".android";
 AndroidVirtualDevice.AVD_DIR_NAME = "avd";
 AndroidVirtualDevice.ENCODING_MASK = /^avd\.ini\.encoding=(.*)$/;
@@ -119,4 +118,5 @@ AndroidVirtualDevice.AVD_VENDOR_NAME = "Avd";
 AndroidVirtualDevice.TIMEOUT_SECONDS = 120;
 AndroidVirtualDevice.GENYMOTION_DEFAULT_STDERR_STRING = "Logging activities to file";
 AndroidVirtualDevice.UNABLE_TO_START_EMULATOR_MESSAGE = "Cannot run the app in the selected native emulator. Try to restart the adb server by running the `adb kill-server` command in the Command Prompt, or increase the allocated RAM of the virtual device through the Android Virtual Device manager. NativeScript CLI users can try to increase the timeout of the operation by adding the `--timeout` flag.";
+exports.AndroidVirtualDevice = AndroidVirtualDevice;
 exports.SOCKET_CONNECTION_TIMEOUT_MS = 30000;

package/lib/common/declarations.d.ts

@@ -217,11 +217,6 @@ declare const enum TrackingTypes {
 	 */
 	GoogleAnalyticsData = "googleAnalyticsData",
 
-	/**
-	 * Defines that the broker process should get and track the data from preview app to Google Analytics
-	 */
-	PreviewAppData = "PreviewAppData",
-
 	/**
 	 * Defines that the broker process should send all the pending information to Analytics.
 	 * After that the process should send information it has finished tracking and die gracefully.
@@ -562,7 +557,7 @@ interface IFileSystem {
 	 */
 	getFileShasum(
 		fileName: string,
-		options?: { algorithm?: string; encoding?: "latin1" | "hex" | "base64" }
+		options?: { algorithm?: string; encoding?: "hex" | "base64" }
 	): Promise<string>;
 
 	// shell.js wrappers
@@ -680,7 +675,6 @@ interface IFutureDispatcher {
 
 interface ICommandDispatcher {
 	dispatchCommand(): Promise<void>;
-	completeCommand(): Promise<boolean>;
 }
 
 interface ICancellationService extends IDisposable {
@@ -815,11 +809,6 @@ interface IAnalyticsService {
 	 */
 	trackEventActionInGoogleAnalytics(data: IEventActionData): Promise<void>;
 
-	/**
-	 * Tracks preview's app data to Google Analytics project.
-	 */
-	trackPreviewAppData(platform: string, projectDir: string): Promise<void>;
-
 	/**
 	 * Defines if the instance should be disposed.
 	 * @param {boolean} shouldDispose Defines if the instance should be disposed and the child processes should be disconnected.
@@ -885,37 +874,6 @@ interface IAnalyticsSettingsService {
 	 * @returns {string} The user agent string.
 	 */
 	getUserAgentString(identifier: string): string;
-
-	/**
-	 * Gets information for projects that are exported from playground
-	 * @param projectDir Project directory path
-	 */
-	getPlaygroundInfo(projectDir?: string): Promise<IPlaygroundInfo>;
-}
-
-/**
- * Designed for getting information for projects that are exported from playground.
- */
-interface IPlaygroundService {
-	/**
-	 * Gets information for projects that are exported from playground
-	 * @return {Promise<IPlaygroundInfo>} collected info
-	 * @param projectDir Project directory path
-	 */
-	getPlaygroundInfo(projectDir?: string): Promise<IPlaygroundInfo>;
-}
-/**
- * Describes information about project that is exported from playground.
- */
-interface IPlaygroundInfo {
-	/**
-	 * The unique client identifier
-	 */
-	id: string;
-	/**
-	 * Whether the user comes from tutorial page. Can be true or false
-	 */
-	usedTutorial: boolean;
 }
 
 interface IAutoCompletionService {
@@ -1739,16 +1697,6 @@ interface IiOSNotificationService {
 	): Promise<number>;
 }
 
-// declare module "stringify-package" {
-// 	function stringifyPackage(data: any, indent: any, newline: string): string
-// 	export = stringifyPackage
-// }
-
-// declare module "detect-newline" {
-// 	function detectNewline(data: string): string | null;
-// 	export = detectNewline
-// }
-
 /**
  * Describes information for application.
  */

package/lib/common/definitions/commands-service.d.ts

@@ -9,7 +9,6 @@ interface ICommandsService {
 		commandName: string,
 		commandArguments: string[]
 	): Promise<boolean>;
-	completeCommand(): Promise<boolean>;
 }
 
 /**

package/lib/common/definitions/commands.d.ts

@@ -30,7 +30,6 @@ interface ICanExecuteCommandOptions {
 }
 
 interface INotConfiguredEnvOptions {
-	hideSyncToPreviewAppOption?: boolean;
 	hideCloudBuildOption?: boolean;
 }
 

package/lib/common/definitions/google-analytics.d.ts

@@ -15,11 +15,6 @@ interface IGoogleAnalyticsData {
 	customDimensions?: IStringDictionary;
 }
 
-interface IPreviewAppGoogleAnalyticsData {
-	platform: string;
-	additionalData?: string;
-}
-
 /**
  * Describes information about event that should be tracked.
  */

package/lib/common/dispatchers.js

@@ -70,11 +70,6 @@ class CommandDispatcher {
             yield this.$commandsService.tryExecuteCommand(commandName, commandArguments);
         });
     }
-    completeCommand() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.$commandsService.completeCommand();
-        });
-    }
     resolveCommand(commandName, commandArguments, argv) {
         return __awaiter(this, void 0, void 0, function* () {
             return { commandName, commandArguments, argv };

package/lib/common/file-system.js

@@ -27,8 +27,9 @@ const shelljs = require("shelljs");
 const helpers_1 = require("./helpers");
 const constants_1 = require("../constants");
 const os_1 = require("os");
-const stringifyPackage = require("stringify-package");
 const detectNewline = require("detect-newline");
+const archiver_1 = require("archiver");
+const stringifyPackage = require("stringify-package");
 const mkdirp = require("mkdirp");
 let FileSystem = FileSystem_1 = class FileSystem {
     constructor($injector) {
@@ -37,31 +38,26 @@ let FileSystem = FileSystem_1 = class FileSystem {
     zipFiles(zipFile, files, zipPathCallback) {
         return __awaiter(this, void 0, void 0, function* () {
             const $logger = this.$injector.resolve("logger");
-            const zipstream = require("zipstream");
-            const zip = zipstream.createZip({ level: 9 });
+            const zip = (0, archiver_1.create)("zip", {
+                zlib: {
+                    level: 9,
+                },
+            });
             const outFile = fs.createWriteStream(zipFile);
             zip.pipe(outFile);
             return new Promise((resolve, reject) => {
                 outFile.on("error", (err) => reject(err));
-                let fileIdx = -1;
-                const zipCallback = () => {
-                    fileIdx++;
-                    if (fileIdx < files.length) {
-                        const file = files[fileIdx];
-                        let relativePath = zipPathCallback(file);
-                        relativePath = relativePath.replace(/\\/g, "/");
-                        $logger.trace("zipping as '%s' file '%s'", relativePath, file);
-                        zip.addFile(fs.createReadStream(file), { name: relativePath }, zipCallback);
-                    }
-                    else {
-                        outFile.on("finish", () => resolve());
-                        zip.finalize((bytesWritten) => {
-                            $logger.debug("zipstream: %d bytes written", bytesWritten);
-                            outFile.end();
-                        });
-                    }
-                };
-                zipCallback();
+                outFile.on("close", () => {
+                    $logger.trace("zip: %d bytes written", zip.pointer());
+                    resolve();
+                });
+                for (const file of files) {
+                    let relativePath = zipPathCallback(file);
+                    relativePath = relativePath.replace(/\\/g, "/");
+                    $logger.trace("zipping as '%s' file '%s'", relativePath, file);
+                    zip.append(fs.createReadStream(file), { name: relativePath });
+                }
+                zip.finalize();
             });
         });
     }

package/lib/common/host-info.js

@@ -20,10 +20,6 @@ const decorators_1 = require("./decorators");
 const _ = require("lodash");
 const yok_1 = require("./yok");
 class HostInfo {
-    constructor($errors, $injector) {
-        this.$errors = $errors;
-        this.$injector = $injector;
-    }
     get $childProcess() {
         return this.$injector.resolve("childProcess");
     }
@@ -33,6 +29,10 @@ class HostInfo {
     get $logger() {
         return this.$injector.resolve("logger");
     }
+    constructor($errors, $injector) {
+        this.$errors = $errors;
+        this.$injector = $injector;
+    }
     get isWindows() {
         return process.platform === HostInfo.WIN32_NAME;
     }

package/lib/common/http-client.js

@@ -64,7 +64,7 @@ class HttpClient {
             if (!headers["User-Agent"]) {
                 if (!this.defaultUserAgent) {
                     this.defaultUserAgent = `${this.$staticConfig.USER_AGENT_NAME}/${this.$staticConfig.version} (Node.js ${process.versions.node}; ${process.platform}; ${process.arch})`;
-                    this.$logger.debug("User-Agent: %s", this.defaultUserAgent);
+                    this.$logger.trace("User-Agent: %s", this.defaultUserAgent);
                 }
                 headers["User-Agent"] = this.defaultUserAgent;
             }
@@ -167,7 +167,7 @@ class HttpClient {
         });
     }
 }
-exports.HttpClient = HttpClient;
 HttpClient.STUCK_REQUEST_ERROR_MESSAGE = "The request can't receive any response.";
 HttpClient.STUCK_RESPONSE_ERROR_MESSAGE = "Can't receive all parts of the response.";
+exports.HttpClient = HttpClient;
 yok_1.injector.register("httpClient", HttpClient);

package/lib/common/logger/layouts/cli-layout.js

@@ -5,6 +5,7 @@ const util_1 = require("util");
 const helpers_1 = require("../../helpers");
 const constants_1 = require("../../../constants");
 const os_1 = require("os");
+const color_1 = require("../../../color");
 function layout(config) {
     return function (logEvent) {
         let msg = util_1.format.apply(null, logEvent.data);
@@ -18,10 +19,13 @@ function layout(config) {
             return msg;
         }
         if (logEvent.level.isEqualTo(constants_1.LoggerLevel.ERROR)) {
-            return msg.red.bold;
+            return color_1.color.red.bold(msg);
         }
         if (logEvent.level.isEqualTo(constants_1.LoggerLevel.WARN)) {
-            return msg.yellow;
+            return color_1.color.yellow(msg);
+        }
+        if (logEvent.level.isEqualTo(constants_1.LoggerLevel.TRACE)) {
+            return color_1.color.grey(msg);
         }
         return msg;
     };

package/lib/common/logger/logger.js

@@ -11,14 +11,14 @@ const log4js = require("log4js");
 const util = require("util");
 const readline = require("readline");
 const stream = require("stream");
-const marked = require("marked");
+const marked_1 = require("marked");
 const _ = require("lodash");
 const decorators_1 = require("../decorators");
 const cli_layout_1 = require("./layouts/cli-layout");
 const constants_1 = require("../../constants");
 const yok_1 = require("../yok");
+const color_1 = require("../../color");
 const TerminalRenderer = require("marked-terminal");
-const chalk = require("chalk");
 class Logger {
     constructor($config) {
         this.$config = $config;
@@ -109,9 +109,9 @@ class Logger {
     printMarkdown(...args) {
         const opts = {
             unescape: true,
-            link: chalk.red,
-            strong: chalk.green.bold,
-            firstHeading: chalk.blue.bold,
+            link: color_1.color.red,
+            strong: color_1.color.green.bold,
+            firstHeading: color_1.color.blue.bold,
             tableOptions: {
                 chars: { mid: "", "left-mid": "", "mid-mid": "", "right-mid": "" },
                 style: {
@@ -123,8 +123,8 @@ class Logger {
                 },
             },
         };
-        marked.setOptions({ renderer: new TerminalRenderer(opts) });
-        const formattedMessage = marked(util.format.apply(null, args));
+        marked_1.marked.setOptions({ renderer: new TerminalRenderer(opts) });
+        const formattedMessage = (0, marked_1.marked)(util.format.apply(null, args));
         this.info(formattedMessage, { [constants_1.LoggerConfigData.skipNewLine]: true });
     }
     isVerbose() {

package/lib/common/mobile/android/android-debug-bridge-result-handler.js

@@ -46,7 +46,6 @@ class AndroidDebugBridgeResultHandler {
         }
     }
 }
-exports.AndroidDebugBridgeResultHandler = AndroidDebugBridgeResultHandler;
 AndroidDebugBridgeResultHandler.ANDROID_DEBUG_BRIDGE_ERRORS = [
     {
         name: "device unauthorized",
@@ -329,4 +328,5 @@ AndroidDebugBridgeResultHandler.ANDROID_DEBUG_BRIDGE_ERRORS = [
         resultCode: -7,
     },
 ];
+exports.AndroidDebugBridgeResultHandler = AndroidDebugBridgeResultHandler;
 yok_1.injector.register("androidDebugBridgeResultHandler", AndroidDebugBridgeResultHandler);