nativescript 8.5.3 → 8.5.4-dev.1

package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js

@@ -152,6 +152,11 @@ class AppDebugSocketProxyFactory extends events_1.EventEmitter {
                 packets.on("data", (buffer) => {
                     const message = buffer.toString(encoding);
                     if (webSocket.readyState === webSocket.OPEN) {
+                        if (process.env.DEBUG_DEVTOOLS_SOCKETS) {
+                            console.log({
+                                msgFromRuntime: JSON.parse(message),
+                            });
+                        }
                         webSocket.send(message);
                     }
                     else {
@@ -165,20 +170,26 @@ class AppDebugSocketProxyFactory extends events_1.EventEmitter {
                     this.$logger.trace("Error on debugger deviceSocket", err);
                 });
                 webSocket.on("message", (message) => {
-                    const length = Buffer.byteLength(message, encoding);
+                    const msg = message.toString();
+                    if (process.env.DEBUG_DEVTOOLS_SOCKETS) {
+                        console.log({
+                            msgFromDevtools: JSON.parse(msg),
+                        });
+                    }
+                    const length = Buffer.byteLength(msg, encoding);
                     const payload = Buffer.allocUnsafe(length + 4);
                     payload.writeInt32BE(length, 0);
-                    payload.write(message, 4, length, encoding);
+                    payload.write(msg, 4, length, encoding);
                     appDebugSocket.write(payload);
                 });
                 appDebugSocket.on("close", () => {
                     currentAppSocket = null;
-                    this.$logger.info("Backend socket closed!");
+                    this.$logger.trace("Backend socket closed!");
                     webSocket.close();
                 });
                 webSocket.on("close", () => __awaiter(this, void 0, void 0, function* () {
                     currentWebSocket = null;
-                    this.$logger.info("Frontend socket closed!");
+                    this.$logger.trace("Frontend socket closed!");
                     appDebugSocket.unpipe(packets);
                     packets.destroy();
                     yield device.destroyDebugSocket(appId);

package/lib/device-sockets/ios/notification.js

@@ -22,9 +22,9 @@ class IOSNotification extends events_1.EventEmitter {
         return `${appId}:NativeScript.Debug.${notification}`;
     }
 }
-exports.IOSNotification = IOSNotification;
 IOSNotification.REFRESH_REQUEST_NOTIFICATION_NAME = "RefreshRequest";
 IOSNotification.APP_REFRESH_STARTED_NOTIFICATION_NAME = "AppRefreshStarted";
 IOSNotification.ATTACH_REQUEST_NOTIFICATION_NAME = "AttachRequest";
 IOSNotification.READY_FOR_ATTACH_NOTIFICATION_NAME = "ReadyForAttach";
+exports.IOSNotification = IOSNotification;
 yok_1.injector.register("iOSNotification", IOSNotification);

package/lib/helpers/android-bundle-validator-helper.js

@@ -46,7 +46,7 @@ class AndroidBundleValidatorHelper extends version_validator_helper_1.VersionVal
         }
     }
 }
-exports.AndroidBundleValidatorHelper = AndroidBundleValidatorHelper;
 AndroidBundleValidatorHelper.MIN_RUNTIME_VERSION = "5.0.0";
 AndroidBundleValidatorHelper.MIN_ANDROID_WITH_AAB_SUPPORT = "4.4.0";
+exports.AndroidBundleValidatorHelper = AndroidBundleValidatorHelper;
 yok_1.injector.register("androidBundleValidatorHelper", AndroidBundleValidatorHelper);

package/lib/helpers/network-connectivity-validator.js

@@ -40,8 +40,8 @@ class NetworkConnectivityValidator {
         });
     }
 }
-exports.NetworkConnectivityValidator = NetworkConnectivityValidator;
 NetworkConnectivityValidator.DNS_LOOKUP_URL = "play.nativescript.org";
 NetworkConnectivityValidator.NO_INTERNET_ERROR_CODE = "ENOTFOUND";
 NetworkConnectivityValidator.NO_INTERNET_ERROR_MESSAGE = "No internet connection. Check your internet settings and try again.";
+exports.NetworkConnectivityValidator = NetworkConnectivityValidator;
 yok_1.injector.register("networkConnectivityValidator", NetworkConnectivityValidator);

package/lib/helpers/options-track-helper.js

@@ -80,9 +80,9 @@ class OptionsTracker {
         }
     }
 }
-exports.OptionsTracker = OptionsTracker;
 OptionsTracker.PASSWORD_DETECTION_STRING = "password";
 OptionsTracker.PRIVATE_REPLACE_VALUE = "private";
 OptionsTracker.PATH_REPLACE_VALUE = "_localpath";
 OptionsTracker.SIZE_EXEEDED_REPLACE_VALUE = "sizeExceeded";
+exports.OptionsTracker = OptionsTracker;
 yok_1.injector.register("optionsTracker", OptionsTracker);

package/lib/nativescript-cli.js

@@ -17,21 +17,26 @@ shelljs.config.fatal = true;
 const errors_1 = require("./common/errors");
 const helpers_1 = require("./common/helpers");
 const yok_1 = require("./common/yok");
+const color_1 = require("./color");
 (0, errors_1.installUncaughtExceptionListener)(process.exit.bind(process, 120));
 const logger = yok_1.injector.resolve("logger");
 exports.originalProcessOn = process.on.bind(process);
 process.on = (event, listener) => {
     if (event === "SIGINT") {
         logger.trace(`Trying to handle SIGINT event. CLI overrides this behavior and does not allow handling SIGINT as this causes issues with Ctrl + C in terminal.`);
-        const msg = "The stackTrace of the location trying to handle SIGINT is:";
+        const msg = "The stackTrace of the location trying to handle SIGINT is";
         const stackTrace = new Error(msg).stack || "";
-        logger.trace(stackTrace.replace(`Error: ${msg}`, msg));
+        logger.trace(stackTrace.replace(`Error: ${msg}`, `${msg} (${color_1.color.yellow("note:")} this is not an error, just a stack-trace for debugging purposes):`));
     }
     else {
         return (0, exports.originalProcessOn)(event, listener);
     }
 };
 (() => __awaiter(void 0, void 0, void 0, function* () {
+    if (process.argv.includes("--get-yargs-completions")) {
+        yok_1.injector.resolve("$options");
+        return;
+    }
     const config = yok_1.injector.resolve("$config");
     const err = yok_1.injector.resolve("$errors");
     err.printCallStack = config.DEBUG;
@@ -45,13 +50,6 @@ process.on = (event, listener) => {
         logger.trace("Unable to load extensions. Error is: ", err);
     }
     const commandDispatcher = yok_1.injector.resolve("commandDispatcher");
-    const messages = yok_1.injector.resolve("$messagesService");
-    messages.pathsToMessageJsonFiles = [];
-    if (process.argv[2] === "completion") {
-        yield commandDispatcher.completeCommand();
-    }
-    else {
-        yield commandDispatcher.dispatchCommand();
-    }
+    yield commandDispatcher.dispatchCommand();
     yok_1.injector.dispose();
 }))();

package/lib/options.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Options = void 0;
 const helpers = require("./common/helpers");
@@ -7,6 +16,25 @@ const helpers_1 = require("yargs/helpers");
 const _ = require("lodash");
 const yok_1 = require("./common/yok");
 class Options {
+    setupOptions(commandSpecificDashedOptions) {
+        if (commandSpecificDashedOptions) {
+            _.extend(this.options, commandSpecificDashedOptions);
+            this.setArgv();
+        }
+        this.argv.bundle = "webpack";
+        if (this.initialArgv.release && this.initialArgv.hmr) {
+            this.$errors.fail("The options --release and --hmr cannot be used simultaneously.");
+        }
+        if (this.argv.hmr) {
+            this.argv.hmr = !this.argv.release;
+        }
+        if (this.argv.debugBrk) {
+            this.argv.hmr = false;
+        }
+        if (this.argv.justlaunch) {
+            this.argv.hmr = false;
+        }
+    }
     constructor($errors, $settingsService) {
         this.$errors = $errors;
         this.$settingsService = $settingsService;
@@ -33,25 +61,6 @@ class Options {
         this.options = _.extend({}, this.commonOptions, this.globalOptions);
         this.setArgv();
     }
-    setupOptions(commandSpecificDashedOptions) {
-        if (commandSpecificDashedOptions) {
-            _.extend(this.options, commandSpecificDashedOptions);
-            this.setArgv();
-        }
-        this.argv.bundle = "webpack";
-        if (this.initialArgv.release && this.initialArgv.hmr) {
-            this.$errors.fail("The options --release and --hmr cannot be used simultaneously.");
-        }
-        if (this.argv.hmr) {
-            this.argv.hmr = !this.argv.release;
-        }
-        if (this.argv.debugBrk) {
-            this.argv.hmr = false;
-        }
-        if (this.argv.justlaunch) {
-            this.argv.hmr = false;
-        }
-    }
     get shorthands() {
         const result = [];
         _.each(_.keys(this.options), (optionName) => {
@@ -291,7 +300,38 @@ class Options {
         _.each(this.options, (value, key) => {
             opts[this.getDashedOptionName(key)] = value;
         });
-        const parsed = yargs((0, helpers_1.hideBin)(process.argv)).version(false).help(false);
+        const parsed = yargs((0, helpers_1.hideBin)(process.argv))
+            .version(false)
+            .help(false)
+            .completion("completion_generate_script", (current_, argv) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const args = argv._.slice(1);
+            const commands = yok_1.injector
+                .getRegisteredCommandsNames(false)
+                .filter((c) => c != "/?");
+            const currentDepth = args.length > 0 ? args.length - 1 : 0;
+            const current = (_a = current_ !== null && current_ !== void 0 ? current_ : args[currentDepth]) !== null && _a !== void 0 ? _a : "";
+            const matchGroups = commands.map((c) => c.split("|"));
+            const possibleMatches = matchGroups.filter((group) => {
+                return group.slice(0, currentDepth).every((g, i) => {
+                    return g === args[i] || args[i].at(0) === "-";
+                });
+            });
+            const completions = [
+                ...new Set(possibleMatches
+                    .map((match) => {
+                    return match[currentDepth];
+                })
+                    .filter(Boolean)),
+            ];
+            if (current.startsWith("--")) {
+                return this.optionNames.filter((o) => o !== "_").map((o) => `--${o}`);
+            }
+            if (current.startsWith("-")) {
+                return this.shorthands.map((o) => `-${o}`);
+            }
+            return completions;
+        }));
         this.initialArgv = parsed.argv;
         this.argv = parsed.options(opts).argv;
         this.$settingsService.setSettings({
@@ -333,7 +373,7 @@ class Options {
         });
     }
 }
-exports.Options = Options;
 Options.DASHED_OPTION_REGEX = /(.+?)([A-Z])(.*)/;
 Options.NONDASHED_OPTION_REGEX = /(.+?)[-]([a-zA-Z])(.*)/;
+exports.Options = Options;
 yok_1.injector.register("options", Options);

package/lib/package-installation-manager.js

@@ -49,12 +49,13 @@ class PackageInstallationManager {
         });
     }
     getMaxSatisfyingVersion(packageName, versionRange) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const data = yield this.$packageManager.view(packageName, {
                 versions: true,
             });
-            return semver.maxSatisfying((_a = data === null || data === void 0 ? void 0 : data.versions) !== null && _a !== void 0 ? _a : data, versionRange);
+            return (_b = semver
+                .maxSatisfying((_a = data === null || data === void 0 ? void 0 : data.versions) !== null && _a !== void 0 ? _a : data, versionRange)) === null || _b === void 0 ? void 0 : _b.toString();
         });
     }
     getMaxSatisfyingVersionSafe(packageName, versionIdentifier) {
@@ -101,7 +102,7 @@ class PackageInstallationManager {
                 return yield this.installCore(packageToInstall, pathToSave, version, dependencyType);
             }
             catch (error) {
-                this.$logger.debug(error);
+                this.$logger.trace(error);
                 throw error;
             }
         });
@@ -112,7 +113,7 @@ class PackageInstallationManager {
                 return yield this.$packageManager.uninstall(packageToUninstall, opts, projectDir);
             }
             catch (error) {
-                this.$logger.debug(error);
+                this.$logger.trace(error);
                 throw error;
             }
         });

package/lib/project-data.js

@@ -15,6 +15,15 @@ const os_1 = require("os");
 const decorators_1 = require("./common/decorators");
 const yok_1 = require("./common/yok");
 class ProjectData {
+    get projectId() {
+        this.warnProjectId();
+        return this.projectIdentifiers.ios;
+    }
+    set projectId(identifier) {
+        this.warnProjectId();
+        this.projectIdentifiers.ios = identifier;
+        this.projectIdentifiers.android = identifier;
+    }
     constructor($fs, $errors, $projectHelper, $staticConfig, $options, $logger, $injector, $androidResourcesMigrationService, $devicePlatformsConstants) {
         this.$fs = $fs;
         this.$errors = $errors;
@@ -26,15 +35,6 @@ class ProjectData {
         this.$androidResourcesMigrationService = $androidResourcesMigrationService;
         this.$devicePlatformsConstants = $devicePlatformsConstants;
     }
-    get projectId() {
-        this.warnProjectId();
-        return this.projectIdentifiers.ios;
-    }
-    set projectId(identifier) {
-        this.warnProjectId();
-        this.projectIdentifiers.ios = identifier;
-        this.projectIdentifiers.android = identifier;
-    }
     get projectConfig() {
         return this.$injector.resolve("projectConfigService");
     }
@@ -88,7 +88,6 @@ 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.previewAppSchema = this.nsConfig && this.nsConfig.previewAppSchema;
             this.webpackConfigPath =
                 this.nsConfig && this.nsConfig.webpackConfigPath
                     ? path.resolve(this.projectDir, this.nsConfig.webpackConfigPath)

package/lib/providers/project-files-provider.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectFilesProvider = void 0;
-const minimatch = require("minimatch");
+const minimatch_1 = require("minimatch");
 const constants = require("../constants");
 const path = require("path");
 const _ = require("lodash");
@@ -38,9 +38,9 @@ class ProjectFilesProvider extends project_files_provider_base_1.ProjectFilesPro
         return mappedFilePath;
     }
     isFileExcluded(filePath) {
-        return !!_.find(ProjectFilesProvider.INTERNAL_NONPROJECT_FILES, (pattern) => minimatch(filePath, pattern, { nocase: true }));
+        return !!_.find(ProjectFilesProvider.INTERNAL_NONPROJECT_FILES, (pattern) => (0, minimatch_1.minimatch)(filePath, pattern, { nocase: true }));
     }
 }
-exports.ProjectFilesProvider = ProjectFilesProvider;
 ProjectFilesProvider.INTERNAL_NONPROJECT_FILES = ["**/*.ts"];
+exports.ProjectFilesProvider = ProjectFilesProvider;
 yok_1.injector.register("projectFilesProvider", ProjectFilesProvider);

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

@@ -47,9 +47,6 @@ process.on("message", (data) => __awaiter(void 0, void 0, void 0, function* () {
     analyticsLoggingService.logData({
         message: `analytics-broker-process received message of type: ${JSON.stringify(data)}`,
     });
-    if (data.type === "PreviewAppData") {
-        return;
-    }
     if (data.type === "FinishTracking") {
         yield finishTracking();
         if (process.connected) {

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

@@ -18,11 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnalyticsBroker = void 0;
 const decorators_1 = require("../../common/decorators");
 class AnalyticsBroker {
-    constructor($analyticsSettingsService, $injector, analyticsLoggingService) {
-        this.$analyticsSettingsService = $analyticsSettingsService;
-        this.$injector = $injector;
-        this.analyticsLoggingService = analyticsLoggingService;
-    }
     getGoogleAnalyticsProvider() {
         return __awaiter(this, void 0, void 0, function* () {
             const clientId = yield this.$analyticsSettingsService.getClientId();
@@ -32,6 +27,11 @@ class AnalyticsBroker {
             });
         });
     }
+    constructor($analyticsSettingsService, $injector, analyticsLoggingService) {
+        this.$analyticsSettingsService = $analyticsSettingsService;
+        this.$injector = $injector;
+        this.analyticsLoggingService = analyticsLoggingService;
+    }
     sendDataForTracking(trackInfo) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

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

@@ -138,10 +138,6 @@ class AnalyticsService {
             yield this.trackInGoogleAnalytics(googleAnalyticsEventData);
         });
     }
-    trackPreviewAppData(platform, projectDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
-    }
     finishTracking() {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {

package/lib/services/analytics/analytics.d.ts

@@ -1,8 +1,5 @@
 import { TrackingTypes } from "../../common/declarations";
-import {
-	IGoogleAnalyticsData,
-	IPreviewAppGoogleAnalyticsData,
-} from "../../common/definitions/google-analytics";
+import { IGoogleAnalyticsData } from "../../common/definitions/google-analytics";
 
 /**
  * Describes the information that will be passed to analytics for tracking.
@@ -45,10 +42,6 @@ interface IGoogleAnalyticsTrackingInformation
 	extends IGoogleAnalyticsData,
 		ITrackingInformation {}
 
-interface IPreviewAppTrackingInformation
-	extends IPreviewAppGoogleAnalyticsData,
-		ITrackingInformation {}
-
 /**
  * Describes methods required to track in Google Analytics.
  */

package/lib/services/analytics/google-analytics-provider.js

@@ -22,14 +22,13 @@ const decorators_1 = require("../../common/decorators");
 const _ = require("lodash");
 const yok_1 = require("../../common/yok");
 class GoogleAnalyticsProvider {
-    constructor(clientId, $staticConfig, $analyticsSettingsService, $logger, $proxyService, $config, $companyInsightsController, analyticsLoggingService) {
+    constructor(clientId, $staticConfig, $analyticsSettingsService, $logger, $proxyService, $config, analyticsLoggingService) {
         this.clientId = clientId;
         this.$staticConfig = $staticConfig;
         this.$analyticsSettingsService = $analyticsSettingsService;
         this.$logger = $logger;
         this.$proxyService = $proxyService;
         this.$config = $config;
-        this.$companyInsightsController = $companyInsightsController;
         this.analyticsLoggingService = analyticsLoggingService;
     }
     trackHit(trackInfo) {
@@ -94,25 +93,6 @@ class GoogleAnalyticsProvider {
                 ["cd4"]: sessionId,
                 ["cd5"]: "Unknown",
             };
-            const playgrounInfo = yield this.$analyticsSettingsService.getPlaygroundInfo();
-            if (playgrounInfo && playgrounInfo.id) {
-                defaultValues["cd7"] =
-                    playgrounInfo.id;
-                defaultValues["cd8"] = playgrounInfo.usedTutorial.toString();
-            }
-            const companyData = yield this.$companyInsightsController.getCompanyData();
-            if (companyData) {
-                defaultValues["cd10"] =
-                    companyData.name;
-                defaultValues["cd11"] =
-                    companyData.country;
-                defaultValues["cd12"] =
-                    companyData.revenue;
-                defaultValues["cd13"] =
-                    companyData.industries;
-                defaultValues["cd14"] =
-                    companyData.employeeCount;
-            }
             customDimensions = _.merge(defaultValues, customDimensions);
             _.each(customDimensions, (value, key) => {
                 this.analyticsLoggingService.logData({

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

@@ -19,14 +19,14 @@ const helpers_1 = require("../common/helpers");
 const decorators_1 = require("../common/decorators");
 const _ = require("lodash");
 const yok_1 = require("../common/yok");
+const color_1 = require("../color");
 class AnalyticsSettingsService {
-    constructor($userSettingsService, $staticConfig, $hostInfo, $osInfo, $logger, $playgroundService) {
+    constructor($userSettingsService, $staticConfig, $hostInfo, $osInfo, $logger) {
         this.$userSettingsService = $userSettingsService;
         this.$staticConfig = $staticConfig;
         this.$hostInfo = $hostInfo;
         this.$osInfo = $osInfo;
         this.$logger = $logger;
-        this.$playgroundService = $playgroundService;
     }
     canDoRequest() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -39,13 +39,8 @@ class AnalyticsSettingsService {
     getClientId() {
         return this.getSettingValueOrDefault(this.$staticConfig.ANALYTICS_INSTALLATION_ID_SETTING_NAME);
     }
-    getPlaygroundInfo(projectDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.$playgroundService.getPlaygroundInfo(projectDir);
-        });
-    }
     getClientName() {
-        return "" + this.$staticConfig.CLIENT_NAME_ALIAS.cyan.bold;
+        return "" + color_1.color.cyan.bold(this.$staticConfig.CLIENT_NAME_ALIAS);
     }
     getUserSessionsCount(projectName) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -103,9 +98,6 @@ AnalyticsSettingsService.SESSIONS_STARTED_KEY_PREFIX = "SESSIONS_STARTED_";
 __decorate([
     (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getClientId", null);
-__decorate([
-    (0, decorators_1.exported)("analyticsSettingsService")
-], AnalyticsSettingsService.prototype, "getPlaygroundInfo", null);
 __decorate([
     (0, decorators_1.exported)("analyticsSettingsService")
 ], AnalyticsSettingsService.prototype, "getUserAgentString", null);

package/lib/services/android-device-debug-service.js

@@ -23,6 +23,9 @@ const decorators_1 = require("../common/decorators");
 const yok_1 = require("../common/yok");
 const _ = require("lodash");
 class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
+    get platform() {
+        return "android";
+    }
     constructor(device, $devicesService, $cleanupService, $errors, $logger, $androidProcessService, $staticConfig, $net, $deviceLogProvider) {
         super(device, $devicesService);
         this.device = device;
@@ -36,9 +39,6 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
         this.$deviceLogProvider = $deviceLogProvider;
         this.deviceIdentifier = device.deviceInfo.identifier;
     }
-    get platform() {
-        return "android";
-    }
     debug(debugData, debugOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             this._packageName = debugData.applicationIdentifier;

package/lib/services/android-plugin-build-service.js

@@ -24,6 +24,9 @@ const yok_1 = require("../common/yok");
 const _ = require("lodash");
 const resolve_package_path_1 = require("@rigor789/resolve-package-path");
 class AndroidPluginBuildService {
+    get $platformsDataService() {
+        return this.$injector.resolve("platformsDataService");
+    }
     constructor($fs, $childProcess, $hostInfo, $androidToolsInfo, $logger, $packageManager, $projectData, $projectDataService, $devicePlatformsConstants, $errors, $filesHashService, $hooksService, $injector, $watchIgnoreListService) {
         this.$fs = $fs;
         this.$childProcess = $childProcess;
@@ -40,9 +43,6 @@ class AndroidPluginBuildService {
         this.$injector = $injector;
         this.$watchIgnoreListService = $watchIgnoreListService;
     }
-    get $platformsDataService() {
-        return this.$injector.resolve("platformsDataService");
-    }
     getAndroidSourceDirectories(source) {
         const directories = [constants_1.RESOURCES_DIR, "java", constants_1.ASSETS_DIR, "jniLibs"];
         const resultArr = [];

package/lib/services/android-resources-migration-service.js

@@ -97,8 +97,8 @@ class AndroidResourcesMigrationService {
         }
     }
 }
-exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 AndroidResourcesMigrationService.ANDROID_DIR = "Android";
 AndroidResourcesMigrationService.ANDROID_DIR_TEMP = "Android-Updated";
 AndroidResourcesMigrationService.ANDROID_DIR_OLD = "Android-Pre-v4";
+exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 yok_1.injector.register("androidResourcesMigrationService", AndroidResourcesMigrationService);

package/lib/services/assets-generation/assets-generation-service.js

@@ -24,17 +24,17 @@ const _ = require("lodash");
 const yok_1 = require("../../common/yok");
 const os_1 = require("os");
 class AssetsGenerationService {
-    constructor($logger, $projectDataService, $fs) {
-        this.$logger = $logger;
-        this.$projectDataService = $projectDataService;
-        this.$fs = $fs;
-    }
     get propertiesToEnumerate() {
         return {
             icon: ["icons"],
             splash: ["splashBackgrounds", "splashCenterImages", "splashImages"],
         };
     }
+    constructor($logger, $projectDataService, $fs) {
+        this.$logger = $logger;
+        this.$projectDataService = $projectDataService;
+        this.$fs = $fs;
+    }
     generateIcons(resourceGenerationData) {
         return __awaiter(this, void 0, void 0, function* () {
             this.$logger.info("Generating icons ...");

package/lib/services/{build-artefacts-service.js → build-artifacts-service.js}

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuildArtefactsService = void 0;
+exports.BuildArtifactsService = void 0;
 const path = require("path");
 const yok_1 = require("../common/yok");
 const _ = require("lodash");
-class BuildArtefactsService {
+class BuildArtifactsService {
     constructor($errors, $fs, $logger) {
         this.$errors = $errors;
         this.$fs = $fs;
@@ -94,5 +94,5 @@ class BuildArtefactsService {
         });
     }
 }
-exports.BuildArtefactsService = BuildArtefactsService;
-yok_1.injector.register("buildArtefactsService", BuildArtefactsService);
+exports.BuildArtifactsService = BuildArtifactsService;
+yok_1.injector.register("buildArtifactsService", BuildArtifactsService);

package/lib/services/cocoapods-service.js

@@ -303,7 +303,7 @@ end`.trim();
         return pods;
     }
 }
-exports.CocoaPodsService = CocoaPodsService;
 CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
 CocoaPodsService.INSTALLER_BLOCK_PARAMETER_NAME = "installer";
+exports.CocoaPodsService = CocoaPodsService;
 yok_1.injector.register("cocoapodsService", CocoaPodsService);

package/lib/services/device/device-install-app-service.js

@@ -14,9 +14,9 @@ const constants_1 = require("../../constants");
 const path = require("path");
 const yok_1 = require("../../common/yok");
 class DeviceInstallAppService {
-    constructor($analyticsService, $buildArtefactsService, $buildInfoFileService, $fs, $logger, $mobileHelper, $projectDataService, $platformsDataService) {
+    constructor($analyticsService, $buildArtifactsService, $buildInfoFileService, $fs, $logger, $mobileHelper, $projectDataService, $platformsDataService) {
         this.$analyticsService = $analyticsService;
-        this.$buildArtefactsService = $buildArtefactsService;
+        this.$buildArtifactsService = $buildArtifactsService;
         this.$buildInfoFileService = $buildInfoFileService;
         this.$fs = $fs;
         this.$logger = $logger;
@@ -36,7 +36,7 @@ class DeviceInstallAppService {
                 projectDir: projectData.projectDir,
             });
             if (!packageFile) {
-                packageFile = yield this.$buildArtefactsService.getLatestAppPackagePath(platformData, buildData);
+                packageFile = yield this.$buildArtifactsService.getLatestAppPackagePath(platformData, buildData);
             }
             yield platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
             const appIdentifier = projectData.projectIdentifiers[platform];