nativescript 8.5.3 → 8.5.4-dev.0

package/lib/common/mobile/android/android-log-filter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AndroidLogFilter = void 0;
 const yok_1 = require("../../yok");
-const os = require("os");
+const os_1 = require("os");
 class AndroidLogFilter {
     constructor($loggingLevels) {
         this.$loggingLevels = $loggingLevels;
@@ -13,15 +13,15 @@ class AndroidLogFilter {
             const log = this.getConsoleLogFromLine(data, loggingOptions.applicationPid);
             if (log) {
                 if (log.tag) {
-                    return `${log.tag}: ${log.message}` + os.EOL;
+                    return `${log.tag}: ${log.message}` + os_1.EOL;
                 }
                 else {
-                    return log.message + os.EOL;
+                    return log.message + os_1.EOL;
                 }
             }
             return null;
         }
-        return data + os.EOL;
+        return data + os_1.EOL;
     }
     getConsoleLogFromLine(lineText, pid) {
         if (pid && lineText.indexOf(pid) < 0) {
@@ -45,7 +45,7 @@ class AndroidLogFilter {
         return consoleLogMessage;
     }
 }
-exports.AndroidLogFilter = AndroidLogFilter;
 AndroidLogFilter.LINE_REGEX = /.\/(.+?)\s*\(\s*\d+?\): (.*)/;
 AndroidLogFilter.API_LEVEL_23_LINE_REGEX = /.+?\s+?(?:[A-Z]\s+?)([A-Za-z \.]+?)\s*?\: (.*)/;
+exports.AndroidLogFilter = AndroidLogFilter;
 yok_1.injector.register("androidLogFilter", AndroidLogFilter);

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

@@ -20,7 +20,7 @@ const net = require("net");
 const path = require("path");
 const os_1 = require("os");
 const _ = require("lodash");
-const osenv = require("osenv");
+const os_2 = require("os");
 const constants_1 = require("../../constants");
 const decorators_1 = require("../../decorators");
 const helpers_1 = require("../../helpers");
@@ -211,7 +211,7 @@ class AndroidVirtualDeviceService {
     get pathToAvdHomeDir() {
         const searchPaths = [
             process.env.ANDROID_AVD_HOME,
-            path.join(osenv.home(), constants_1.AndroidVirtualDevice.ANDROID_DIR_NAME, constants_1.AndroidVirtualDevice.AVD_DIR_NAME),
+            path.join((0, os_2.homedir)(), constants_1.AndroidVirtualDevice.ANDROID_DIR_NAME, constants_1.AndroidVirtualDevice.AVD_DIR_NAME),
         ];
         return searchPaths.find((p) => p && this.$fs.exists(p));
     }

package/lib/common/mobile/android/genymotion/genymotion-service.js

@@ -21,7 +21,7 @@ const helpers_1 = require("../../../helpers");
 const os_1 = require("os");
 const path = require("path");
 const _ = require("lodash");
-const osenv = require("osenv");
+const os_2 = require("os");
 const decorators_1 = require("../../../decorators");
 const constants_2 = require("../../../../constants");
 const yok_1 = require("../../../yok");
@@ -119,7 +119,7 @@ class AndroidGenymotionService {
                 "/Applications/Genymotion.app/Contents/MacOS/player.app/Contents/MacOS/player",
                 "/Applications/Genymotion.app/Contents/MacOS/player",
             ],
-            linux: [path.join(osenv.home(), "genymotion", "player")],
+            linux: [path.join((0, os_2.homedir)(), "genymotion", "player")],
             win32: [
                 `${process.env["PROGRAMFILES"]}\\Genymobile\\Genymotion\\player.exe`,
                 `${process.env["PROGRAMFILES(X86)"]}\\Genymobile\\Genymotion\\player.exe`,

package/lib/common/mobile/android/logcat-helper.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogcatHelper = void 0;
 const byline = require("byline");
-const device_android_debug_bridge_1 = require("./device-android-debug-bridge");
 const semver = require("semver");
 const yok_1 = require("../../yok");
+const device_android_debug_bridge_1 = require("./device-android-debug-bridge");
 class LogcatHelper {
     constructor($deviceLogProvider, $devicePlatformsConstants, $logger, $injector, $devicesService) {
         this.$deviceLogProvider = $deviceLogProvider;

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

@@ -4,8 +4,8 @@ exports.DeviceLogProvider = void 0;
 const device_log_provider_base_1 = require("./device-log-provider-base");
 const constants_1 = require("../constants");
 const yok_1 = require("../yok");
-const chalk = require("chalk");
 const constants_2 = require("../../constants");
+const color_1 = require("../../color");
 class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase {
     constructor($logFilter, $logger, $logSourceMapService, $timelineProfilerService, $options) {
         super($logFilter, $logger, $logSourceMapService);
@@ -17,15 +17,15 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
         this.consoleLogLevelRegex = /^CONSOLE (LOG|INFO|WARN|ERROR|TRACE|INFO( .+)):\s/;
         this.consoleLevelColor = {
             log: (line) => line,
-            info: chalk.cyanBright,
-            warn: chalk.yellowBright,
-            error: chalk.redBright,
-            trace: chalk.grey,
-            time: chalk.greenBright,
+            info: color_1.color.cyanBright,
+            warn: color_1.color.yellowBright,
+            error: color_1.color.redBright,
+            trace: color_1.color.grey,
+            time: color_1.color.greenBright,
         };
         this.deviceColorMap = new Map();
         this.colorPool = [
-            "bgGray",
+            "bgBlackBright",
             "bgMagentaBright",
             "bgBlueBright",
             "bgWhiteBright",
@@ -110,7 +110,7 @@ class DeviceLogProvider extends device_log_provider_base_1.DeviceLogProviderBase
                 .join("")
                 .trim();
             toLog.split("\n").forEach((actualLine) => {
-                this.printLine(chalk[this.getDeviceColor(deviceIdentifier)](" "), this.consoleLevelColor[level](actualLine));
+                this.printLine(color_1.color[this.getDeviceColor(deviceIdentifier)](" "), this.consoleLevelColor[level](actualLine));
             });
         }
     }

package/lib/common/mobile/ios/device/ios-device-file-system.js

@@ -129,5 +129,5 @@ class IOSDeviceFileSystem {
         });
     }
 }
-exports.IOSDeviceFileSystem = IOSDeviceFileSystem;
 IOSDeviceFileSystem.AFC_DELETE_FILE_NOT_FOUND_ERROR = 8;
+exports.IOSDeviceFileSystem = IOSDeviceFileSystem;

package/lib/common/mobile/ios/simulator/ios-emulator-services.js

@@ -71,7 +71,7 @@ class IosEmulatorServices {
                 return socket;
             }
             catch (e) {
-                this.$logger.debug(e);
+                this.$logger.trace(e);
             }
         });
     }

package/lib/common/mobile/ios/simulator/ios-sim-resolver.js

@@ -17,7 +17,7 @@ class IOSSimResolver {
         return path.join(require.resolve(IOSSimResolver.iOSSimName), "..", IOSSimResolver.iOSStandaloneExecutableName);
     }
 }
-exports.IOSSimResolver = IOSSimResolver;
 IOSSimResolver.iOSSimName = "ios-sim-portable";
 IOSSimResolver.iOSStandaloneExecutableName = "ios-sim-standalone.js";
+exports.IOSSimResolver = IOSSimResolver;
 yok_1.injector.register("iOSSimResolver", IOSSimResolver);

package/lib/common/mobile/mobile-helper.js

@@ -85,6 +85,6 @@ class MobileHelper {
         });
     }
 }
-exports.MobileHelper = MobileHelper;
 MobileHelper.DEVICE_PATH_SEPARATOR = "/";
+exports.MobileHelper = MobileHelper;
 yok_1.injector.register("mobileHelper", MobileHelper);

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

@@ -12,15 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const yok_1 = require("../../yok");
 class Wp8EmulatorServices {
-    constructor($logger, $childProcess) {
-        this.$logger = $logger;
-        this.$childProcess = $childProcess;
-    }
     static get programFilesPath() {
         return process.arch === "x64"
             ? process.env["PROGRAMFILES(X86)"]
             : process.env.ProgramFiles;
     }
+    constructor($logger, $childProcess) {
+        this.$logger = $logger;
+        this.$childProcess = $childProcess;
+    }
     getEmulatorId() {
         return __awaiter(this, void 0, void 0, function* () {
             return "";

package/lib/common/opener.js

@@ -5,7 +5,11 @@ const xopen = require("open");
 const yok_1 = require("./yok");
 class Opener {
     open(target, appname) {
-        return xopen(target, appname);
+        return xopen(target, {
+            app: {
+                name: appname,
+            },
+        });
     }
 }
 exports.Opener = Opener;

package/lib/common/plist-parser.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlistParser = void 0;
-const simplePlist = require("simple-plist");
+const simple_plist_1 = require("simple-plist");
 const yok_1 = require("./yok");
 class PlistParser {
     parseFile(plistFilePath) {
         return new Promise((resolve, reject) => {
-            simplePlist.readFile(plistFilePath, (err, obj) => {
+            (0, simple_plist_1.readFile)(plistFilePath, (err, obj) => {
                 if (err) {
                     reject(err);
                 }
@@ -17,7 +17,7 @@ class PlistParser {
         });
     }
     parseFileSync(plistFilePath) {
-        return simplePlist.readFileSync(plistFilePath);
+        return (0, simple_plist_1.readFileSync)(plistFilePath);
     }
 }
 exports.PlistParser = PlistParser;

package/lib/common/project-helper.js

@@ -25,13 +25,13 @@ class ProjectHelper {
             const projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
             if (this.$fs.exists(projectFilePath) &&
                 this.isProjectFileCorrect(projectFilePath)) {
-                this.$logger.debug("Project directory is '%s'.", projectDir);
+                this.$logger.trace("Project directory is '%s'.", projectDir);
                 this.cachedProjectDir = projectDir;
                 break;
             }
             const dir = path.dirname(projectDir);
             if (dir === projectDir) {
-                this.$logger.debug("No project found at or above '%s'.", this.$options.path || path.resolve("."));
+                this.$logger.trace("No project found at or above '%s'.", this.$options.path || path.resolve("."));
                 break;
             }
             projectDir = dir;

package/lib/common/services/analytics/google-analytics-custom-dimensions.d.ts

@@ -5,12 +5,12 @@ declare const enum GoogleAnalyticsCustomDimensions {
 	sessionID = "cd4",
 	client = "cd5",
 	nodeVersion = "cd6",
-	playgroundId = "cd7",
-	usedTutorial = "cd8",
+	// playgroundId = "cd7",
+	// usedTutorial = "cd8",
 	isShared = "cd9",
-	companyName = "cd10",
-	companyCountry = "cd11",
-	companyRevenue = "cd12",
-	companyIndustries = "cd13",
-	companyEmployeeCount = "cd14",
+	// companyName = "cd10",
+	// companyCountry = "cd11",
+	// companyRevenue = "cd12",
+	// companyIndustries = "cd13",
+	// companyEmployeeCount = "cd14",
 }

package/lib/common/services/auto-completion-service.js

@@ -16,7 +16,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoCompletionService = void 0;
-const osenv = require("osenv");
+const os_1 = require("os");
 const path = require("path");
 const util = require("util");
 const _ = require("lodash");
@@ -212,7 +212,7 @@ class AutoCompletionService {
         });
     }
     getHomePath(fileName) {
-        return path.join(osenv.home(), fileName);
+        return path.join((0, os_1.homedir)(), fileName);
     }
 }
 AutoCompletionService.COMPLETION_START_COMMENT_PATTERN = "###-%s-completion-start-###";

package/lib/common/services/commands-service.js

@@ -8,13 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandsService = void 0;
 const jaroWinklerDistance = require("../vendor/jaro-winkler_distance");
@@ -29,8 +22,10 @@ class CommandArgumentsValidationHelper {
     }
 }
 class CommandsService {
-    constructor($analyticsSettingsService, $errors, $hooksService, $injector, $logger, $options, $staticConfig, $extensibilityService, $optionsTracker) {
-        this.$analyticsSettingsService = $analyticsSettingsService;
+    get currentCommandData() {
+        return _.last(this.commands);
+    }
+    constructor($errors, $hooksService, $injector, $logger, $options, $staticConfig, $extensibilityService, $optionsTracker) {
         this.$errors = $errors;
         this.$hooksService = $hooksService;
         this.$injector = $injector;
@@ -41,9 +36,6 @@ class CommandsService {
         this.$optionsTracker = $optionsTracker;
         this.commands = [];
     }
-    get currentCommandData() {
-        return _.last(this.commands);
-    }
     allCommands(opts) {
         const commands = this.$injector.getRegisteredCommandsNames(opts.includeDevCommands);
         return _.reject(commands, (command) => _.includes(command, "|"));
@@ -64,13 +56,6 @@ class CommandsService {
                         path: beautifiedCommandName,
                         title: beautifiedCommandName,
                     };
-                    const playgrounInfo = yield this.$analyticsSettingsService.getPlaygroundInfo(null);
-                    if (playgrounInfo && playgrounInfo.id) {
-                        googleAnalyticsPageData.customDimensions = {
-                            ["cd7"]: playgrounInfo.id,
-                            ["cd8"]: playgrounInfo.usedTutorial.toString(),
-                        };
-                    }
                     yield analyticsService.trackInGoogleAnalytics(googleAnalyticsPageData);
                     yield this.$optionsTracker.trackOptions(this.$options);
                 }
@@ -272,106 +257,12 @@ class CommandsService {
             this.$logger.fatal(message.join("\n"));
         }
     }
-    completeCommand() {
-        var e_1, _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const tabtab = require("tabtab");
-            const completeCallback = (err, data) => {
-                if (err || !data) {
-                    return;
-                }
-                const commands = this.$injector.getRegisteredCommandsNames(false);
-                const splittedLine = data.line.split(/[ ]+/);
-                const line = _.filter(splittedLine, (w) => w !== "");
-                let commandName = line[line.length - 2];
-                const childrenCommands = this.$injector.getChildrenCommandsNames(commandName);
-                if (data.last && _.startsWith(data.last, "--")) {
-                    return tabtab.log(_.keys(this.$options.options), data, "--");
-                }
-                if (data.last && _.startsWith(data.last, "-")) {
-                    return tabtab.log(this.$options.shorthands, data, "-");
-                }
-                if (data.words === 1) {
-                    const allCommands = this.allCommands({ includeDevCommands: false });
-                    return tabtab.log(allCommands, data);
-                }
-                if (data.words >= 2) {
-                    if (data.words !== line.length) {
-                        commandName = `${line[data.words - 2]}|${line[data.words - 1]}`;
-                    }
-                    else {
-                        commandName = `${line[line.length - 1]}`;
-                    }
-                }
-                const command = this.$injector.resolveCommand(commandName);
-                if (command) {
-                    const completionData = command.completionData;
-                    if (completionData) {
-                        return tabtab.log(completionData, data);
-                    }
-                    else {
-                        return this.logChildrenCommandsNames(commandName, commands, tabtab, data);
-                    }
-                }
-                else if (childrenCommands) {
-                    let nonDefaultSubCommands = _.reject(childrenCommands, (children) => children[0] === "*");
-                    let sanitizedChildrenCommands = [];
-                    if (data.words !== line.length) {
-                        sanitizedChildrenCommands = nonDefaultSubCommands.map((commandToMap) => {
-                            const pipePosition = commandToMap.indexOf("|");
-                            return commandToMap.substring(0, pipePosition !== -1 ? pipePosition : commandToMap.length);
-                        });
-                    }
-                    else {
-                        nonDefaultSubCommands = nonDefaultSubCommands.filter((commandNameToFilter) => commandNameToFilter.indexOf("|") !== -1);
-                        sanitizedChildrenCommands = nonDefaultSubCommands.map((commandToMap) => {
-                            const pipePosition = commandToMap.lastIndexOf("|");
-                            return commandToMap.substring(pipePosition !== -1 ? pipePosition + 1 : 0, commandToMap.length);
-                        });
-                    }
-                    return tabtab.log(sanitizedChildrenCommands, data);
-                }
-                else {
-                    return this.logChildrenCommandsNames(commandName, commands, tabtab, data);
-                }
-            };
-            const aliases = ["ns", "nsc", "tns", "nativescript"];
-            try {
-                for (var aliases_1 = __asyncValues(aliases), aliases_1_1; aliases_1_1 = yield aliases_1.next(), !aliases_1_1.done;) {
-                    const alias = aliases_1_1.value;
-                    yield tabtab.complete(alias, completeCallback);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (aliases_1_1 && !aliases_1_1.done && (_a = aliases_1.return)) yield _a.call(aliases_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            return true;
-        });
-    }
     beautifyCommandName(commandName) {
         if (commandName.indexOf("*") > 0) {
-            return commandName.substr(0, commandName.indexOf("|"));
+            return commandName.substring(0, commandName.indexOf("|"));
         }
         return commandName;
     }
-    logChildrenCommandsNames(commandName, commands, tabtab, data) {
-        const matchingCommands = commands
-            .filter((commandToFilter) => {
-            return (commandToFilter.indexOf(commandName + "|") !== -1 &&
-                commandToFilter !== commandName);
-        })
-            .map((commandToMap) => {
-            const commandResult = commandToMap.replace(commandName + "|", "");
-            return commandResult.substring(0, commandResult.indexOf("|") !== -1
-                ? commandResult.indexOf("|")
-                : commandResult.length);
-        });
-        return tabtab.log(matchingCommands, data);
-    }
 }
 exports.CommandsService = CommandsService;
 yok_1.injector.register("commandsService", CommandsService);

package/lib/common/services/help-service.js

@@ -12,23 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HelpService = void 0;
 const path = require("path");
 const os_1 = require("os");
-const marked = require("marked");
+const marked_1 = require("marked");
 const yok_1 = require("../yok");
 const _ = require("lodash");
 class HelpService {
-    constructor($logger, $injector, $errors, $fs, $staticConfig, $extensibilityService, $microTemplateService, $opener) {
-        this.$logger = $logger;
-        this.$injector = $injector;
-        this.$errors = $errors;
-        this.$fs = $fs;
-        this.$staticConfig = $staticConfig;
-        this.$extensibilityService = $extensibilityService;
-        this.$microTemplateService = $microTemplateService;
-        this.$opener = $opener;
-        this.pathToImages = this.$staticConfig.HTML_CLI_HELPERS_DIR;
-        this.pathToHtmlPages = this.$staticConfig.HTML_PAGES_DIR;
-        this.pathToManPages = this.$staticConfig.MAN_PAGES_DIR;
-    }
     get newLineRegex() {
         return /\r?\n/g;
     }
@@ -44,6 +31,19 @@ class HelpService {
     get pathToIndexHtml() {
         return path.join(this.$staticConfig.HTML_PAGES_DIR, "index.html");
     }
+    constructor($logger, $injector, $errors, $fs, $staticConfig, $extensibilityService, $microTemplateService, $opener) {
+        this.$logger = $logger;
+        this.$injector = $injector;
+        this.$errors = $errors;
+        this.$fs = $fs;
+        this.$staticConfig = $staticConfig;
+        this.$extensibilityService = $extensibilityService;
+        this.$microTemplateService = $microTemplateService;
+        this.$opener = $opener;
+        this.pathToImages = this.$staticConfig.HTML_CLI_HELPERS_DIR;
+        this.pathToHtmlPages = this.$staticConfig.HTML_PAGES_DIR;
+        this.pathToManPages = this.$staticConfig.MAN_PAGES_DIR;
+    }
     openHelpForCommandInBrowser(commandData) {
         return __awaiter(this, void 0, void 0, function* () {
             const { commandName } = commandData;
@@ -136,7 +136,7 @@ class HelpService {
             const outputText = yield this.$microTemplateService.parseContent(helpText, {
                 isHtml: true,
             });
-            const htmlText = marked(outputText);
+            const htmlText = (0, marked_1.marked)(outputText);
             const filePath = pathToMdFile
                 .replace(path.basename(pathToMdPages), path.basename(pathToHtmlPages))
                 .replace(mdFileName, htmlFileName);
@@ -237,7 +237,6 @@ class HelpService {
         });
     }
 }
-exports.HelpService = HelpService;
 HelpService.MARKDOWN_FILE_EXTENSION = ".md";
 HelpService.HTML_FILE_EXTENSION = ".html";
 HelpService.MAN_PAGE_NAME_REGEX = /@MAN_PAGE_NAME@/g;
@@ -249,4 +248,5 @@ HelpService.EXTENSION_NAME_REGEX = /@EXTENSION_NAME@/g;
 HelpService.MARKDOWN_LINK_REGEX = /\[([\w \-\`\<\>\*\:\\]+?)\]\([\s\S]+?\)/g;
 HelpService.SPAN_REGEX = /([\s\S]*?)(?:\r?\n)?<span.*?>([\s\S]*?)<\/span>(?:\r?\n)*/g;
 HelpService.NEW_LINE_REGEX = /<\/?\s*?br\s*?\/?>/g;
+exports.HelpService = HelpService;
 yok_1.injector.register("helpService", HelpService);

package/lib/common/services/hooks-service.js

@@ -22,6 +22,7 @@ const _ = require("lodash");
 const helpers_1 = require("../helpers");
 const constants_1 = require("../../constants");
 const yok_1 = require("../yok");
+const color_1 = require("../../color");
 const decorators_1 = require("../decorators");
 class Hook {
     constructor(name, fullPath) {
@@ -125,7 +126,7 @@ class HooksService {
                 this.$logger.trace(`Validating ${hookName} arguments.`);
                 const invalidArguments = this.validateHookArguments(hookEntryPoint, hook.fullPath);
                 if (invalidArguments.length) {
-                    this.$logger.warn(`${hook.fullPath} will NOT be executed because it has invalid arguments - ${invalidArguments.join(", ").grey}.`);
+                    this.$logger.warn(`${hook.fullPath} will NOT be executed because it has invalid arguments - ${color_1.color.grey(invalidArguments.join(", "))}.`);
                     return;
                 }
                 const projectDataHookArg = hookArguments["hookArgs"] && hookArguments["hookArgs"]["projectData"];

package/lib/common/services/json-file-settings-service.js

@@ -15,6 +15,9 @@ const helpers_1 = require("../helpers");
 const _ = require("lodash");
 const yok_1 = require("../yok");
 class JsonFileSettingsService {
+    get lockFilePath() {
+        return `${this.jsonSettingsFilePath}.lock`;
+    }
     constructor(jsonFileSettingsPath, $fs, $lockService, $logger) {
         this.$fs = $fs;
         this.$lockService = $lockService;
@@ -23,9 +26,6 @@ class JsonFileSettingsService {
         this.jsonSettingsData = null;
         this.jsonSettingsFilePath = jsonFileSettingsPath;
     }
-    get lockFilePath() {
-        return `${this.jsonSettingsFilePath}.lock`;
-    }
     getSettingValue(settingName, cacheOpts) {
         return __awaiter(this, void 0, void 0, function* () {
             const action = () => __awaiter(this, void 0, void 0, function* () {

package/lib/common/services/lock-service.js

@@ -23,11 +23,6 @@ const helpers_1 = require("../helpers");
 const yok_1 = require("../yok");
 const _ = require("lodash");
 class LockService {
-    constructor($fs, $settingsService, $cleanupService) {
-        this.$fs = $fs;
-        this.$settingsService = $settingsService;
-        this.$cleanupService = $cleanupService;
-    }
     get defaultLockFilePath() {
         return this.getAbsoluteLockFilePath("lockfile.lock");
     }
@@ -42,6 +37,11 @@ class LockService {
         };
         return lockParams;
     }
+    constructor($fs, $settingsService, $cleanupService) {
+        this.$fs = $fs;
+        this.$settingsService = $settingsService;
+        this.$cleanupService = $cleanupService;
+    }
     executeActionWithLock(action, lockFilePath, lockOpts) {
         return __awaiter(this, void 0, void 0, function* () {
             const releaseFunc = yield this.lock(lockFilePath, lockOpts);

package/lib/common/services/messages-service.js

@@ -6,12 +6,6 @@ const path_1 = require("path");
 const _ = require("lodash");
 const yok_1 = require("../yok");
 class MessagesService {
-    constructor($fs) {
-        this.$fs = $fs;
-        this._pathsToMessageJsonFiles = null;
-        this._messageJsonFilesContentsCache = null;
-        this._pathsToMessageJsonFiles = [this.pathToDefaultMessageJson];
-    }
     get pathToDefaultMessageJson() {
         return (0, path_1.join)(__dirname, "..", "resources", "messages", "errorMessages.json");
     }
@@ -22,6 +16,12 @@ class MessagesService {
         }
         return this._messageJsonFilesContentsCache;
     }
+    constructor($fs) {
+        this.$fs = $fs;
+        this._pathsToMessageJsonFiles = null;
+        this._messageJsonFilesContentsCache = null;
+        this._pathsToMessageJsonFiles = [this.pathToDefaultMessageJson];
+    }
     get pathsToMessageJsonFiles() {
         if (!this._pathsToMessageJsonFiles) {
             throw new Error("No paths to message json files provided.");

package/lib/common/services/net-service.js

@@ -132,6 +132,6 @@ class Net {
         });
     }
 }
-exports.Net = Net;
 Net.DEFAULT_INTERVAL = 1000;
+exports.Net = Net;
 yok_1.injector.register("net", Net);

package/lib/common/services/project-files-manager.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectFilesManager = void 0;
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const path = require("path");
 const util = require("util");
 const _ = require("lodash");
@@ -32,7 +32,7 @@ class ProjectFilesManager {
         return projectFiles;
     }
     isFileExcluded(filePath, excludedProjectDirsAndFiles) {
-        const isInExcludedList = !!_.find(excludedProjectDirsAndFiles, (pattern) => minimatch(filePath, pattern, { nocase: true }));
+        const isInExcludedList = !!_.find(excludedProjectDirsAndFiles, (pattern) => (0, minimatch_1.minimatch)(filePath, pattern, { nocase: true }));
         return (isInExcludedList || this.$projectFilesProvider.isFileExcluded(filePath));
     }
     createLocalToDevicePaths(deviceAppData, projectFilesPath, files, excludedProjectDirsAndFiles, projectFilesConfig) {

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

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingsService = void 0;
 const decorators_1 = require("../decorators");
 const path = require("path");
-const osenv = require("osenv");
+const os_1 = require("os");
 const yok_1 = require("../yok");
 class SettingsService {
     constructor($staticConfig, $hostInfo) {
@@ -31,7 +31,7 @@ class SettingsService {
     getDefaultProfileDir() {
         const defaultProfileDirLocation = this.$hostInfo.isWindows
             ? process.env.AppData
-            : path.join(osenv.home(), ".local", "share");
+            : path.join((0, os_1.homedir)(), ".local", "share");
         return path.join(defaultProfileDirLocation, this.$staticConfig.PROFILE_DIR_NAME);
     }
 }