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

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

@@ -99,6 +99,12 @@ declare global {
 			 * For iOS simulators - same as the identifier.
 			 */
 			imageIdentifier?: string;
+
+			/**
+			 *  Optional property describing the architecture of the device
+			 *  Available for Android only
+			 */
+			 abis?: string[];
 		}
 
 		interface IDeviceError extends Error, IDeviceIdentifier {}
@@ -131,7 +137,7 @@ declare global {
 				appId: string,
 				projectName: string,
 				projectDir: string,
-				ensureAppStarted?: boolean
+				ensureAppStarted?: boolean,
 			): Promise<any>;
 			destroyDebugSocket(appId: string): Promise<void>;
 			openDeviceLogStream(options?: IiOSLogStreamOptions): Promise<void>;
@@ -146,7 +152,7 @@ declare global {
 
 		interface IAndroidDeviceFileSystem extends IDeviceFileSystem {
 			getDeviceHashService(
-				appIdentifier: string
+				appIdentifier: string,
 			): Mobile.IAndroidDeviceHashService;
 		}
 
@@ -240,7 +246,7 @@ declare global {
 			 */
 			setProjectNameForDevice(
 				deviceIdentifier: string,
-				projectName: string
+				projectName: string,
 			): void;
 
 			/**
@@ -250,7 +256,7 @@ declare global {
 			 */
 			setProjectDirForDevice(
 				deviceIdentifier: string,
-				projectDir: string
+				projectDir: string,
 			): void;
 		}
 
@@ -293,7 +299,7 @@ declare global {
 			 */
 			startLogProcess(
 				deviceId: string,
-				options?: Mobile.IiOSLogStreamOptions
+				options?: Mobile.IiOSLogStreamOptions,
 			): Promise<void>;
 		}
 
@@ -317,7 +323,7 @@ declare global {
 			filterData(
 				platform: string,
 				data: string,
-				deviceLogOptions: Mobile.IDeviceLogOptions
+				deviceLogOptions: Mobile.IDeviceLogOptions,
 			): string;
 		}
 
@@ -334,7 +340,7 @@ declare global {
 			replaceWithOriginalFileLocations(
 				platform: string,
 				messageData: string,
-				loggingOptions: Mobile.IDeviceLogOptions
+				loggingOptions: Mobile.IDeviceLogOptions,
 			): string;
 		}
 
@@ -351,7 +357,7 @@ declare global {
 			 */
 			filterData(
 				data: string,
-				deviceLogOptions: Mobile.IDeviceLogOptions
+				deviceLogOptions: Mobile.IDeviceLogOptions,
 			): string;
 		}
 
@@ -380,13 +386,13 @@ declare global {
 			installApplication(
 				packageFilePath: string,
 				appIdentifier?: string,
-				buildData?: IBuildData
+				buildData?: IBuildData,
 			): Promise<void>;
 			uninstallApplication(appIdentifier: string): Promise<void>;
 			reinstallApplication(
 				appIdentifier: string,
 				packageFilePath: string,
-				buildData?: IBuildData
+				buildData?: IBuildData,
 			): Promise<void>;
 			startApplication(appData: IStartApplicationData): Promise<void>;
 			stopApplication(appData: IApplicationData): Promise<void>;
@@ -395,7 +401,7 @@ declare global {
 			tryStartApplication(appData: IApplicationData): Promise<void>;
 			getDebuggableApps(): Promise<Mobile.IDeviceApplicationInformation[]>;
 			getDebuggableAppViews(
-				appIdentifiers: string[]
+				appIdentifiers: string[],
 			): Promise<IDictionary<Mobile.IDebugWebViewInfo[]>>;
 			/**
 			 * Sets the files transferred on device.
@@ -432,34 +438,34 @@ declare global {
 			getFile(
 				deviceFilePath: string,
 				appIdentifier: string,
-				outputFilePath?: string
+				outputFilePath?: string,
 			): Promise<void>;
 			getFileContent(
 				deviceFilePath: string,
-				appIdentifier: string
+				appIdentifier: string,
 			): Promise<string>;
 			putFile(
 				localFilePath: string,
 				deviceFilePath: string,
-				appIdentifier: string
+				appIdentifier: string,
 			): Promise<void>;
 			deleteFile(deviceFilePath: string, appIdentifier: string): Promise<void>;
 			transferFiles(
 				deviceAppData: Mobile.IDeviceAppData,
-				localToDevicePaths: Mobile.ILocalToDevicePathData[]
+				localToDevicePaths: Mobile.ILocalToDevicePathData[],
 			): Promise<Mobile.ILocalToDevicePathData[]>;
 			transferDirectory(
 				deviceAppData: Mobile.IDeviceAppData,
 				localToDevicePaths: Mobile.ILocalToDevicePathData[],
-				projectFilesPath: string
+				projectFilesPath: string,
 			): Promise<Mobile.ILocalToDevicePathData[]>;
 			transferFile?(
 				localFilePath: string,
-				deviceFilePath: string
+				deviceFilePath: string,
 			): Promise<void>;
 			createFileOnDevice?(
 				deviceFilePath: string,
-				fileContent: string
+				fileContent: string,
 			): Promise<void>;
 			/**
 			 * Updates the hash file on device with the current hashes of files.
@@ -468,7 +474,7 @@ declare global {
 			 */
 			updateHashesOnDevice(
 				hashes: IStringDictionary,
-				appIdentifier: string
+				appIdentifier: string,
 			): Promise<void>;
 		}
 
@@ -483,11 +489,11 @@ declare global {
 		interface IAndroidDebugBridge {
 			executeCommand(
 				args: string[],
-				options?: IAndroidDebugBridgeCommandOptions
+				options?: IAndroidDebugBridgeCommandOptions,
 			): Promise<any>;
 			executeShellCommand(
 				args: string[],
-				options?: IAndroidDebugBridgeCommandOptions
+				options?: IAndroidDebugBridgeCommandOptions,
 			): Promise<any>;
 			pushFile(localFilePath: string, deviceFilePath: string): Promise<void>;
 			removeFile(deviceFilePath: string): Promise<void>;
@@ -514,7 +520,7 @@ declare global {
 		interface IDeviceAndroidDebugBridge extends IAndroidDebugBridge {
 			sendBroadcastToDevice(
 				action: string,
-				extras?: IStringDictionary
+				extras?: IStringDictionary,
 			): Promise<number>;
 		}
 
@@ -557,7 +563,7 @@ declare global {
 			skipEmulatorStart?: boolean;
 			/**
 			 * Currently available only for iOS. Specifies the sdk version of the iOS simulator.
-			 * In case when `tns run ios --device "iPhone 6"` command is executed, the user can specify the sdk of the simulator because it is possible to have more than one device with the same name but with different sdk versions.
+			 * In case when `ns run ios --device "iPhone 6"` command is executed, the user can specify the sdk of the simulator because it is possible to have more than one device with the same name but with different sdk versions.
 			 */
 			sdk?: string;
 
@@ -587,7 +593,7 @@ declare global {
 			execute<T>(
 				action: (device: Mobile.IDevice) => Promise<T>,
 				canExecute?: (dev: Mobile.IDevice) => boolean,
-				options?: { allowNoDevices?: boolean }
+				options?: { allowNoDevices?: boolean },
 			): Promise<IDeviceActionResult<T>[]>;
 
 			/**
@@ -622,7 +628,7 @@ declare global {
 				deviceIdentifiers: string[],
 				appIdentifier: string,
 				framework: string,
-				projectDir: string
+				projectDir: string,
 			): Promise<IAppInstalledInfo>[];
 			setLogLevel(logLevel: string, deviceIdentifier?: string): void;
 			deployOnDevices(
@@ -630,20 +636,20 @@ declare global {
 				packageFile: string,
 				packageName: string,
 				framework: string,
-				projectDir: string
+				projectDir: string,
 			): Promise<void>[];
 			getDeviceByIdentifier(identifier: string): Mobile.IDevice;
 			mapAbstractToTcpPort(
 				deviceIdentifier: string,
 				appIdentifier: string,
-				framework: string
+				framework: string,
 			): Promise<string>;
 			getDebuggableApps(
-				deviceIdentifiers: string[]
+				deviceIdentifiers: string[],
 			): Promise<Mobile.IDeviceApplicationInformation[]>[];
 			getDebuggableViews(
 				deviceIdentifier: string,
-				appIdentifier: string
+				appIdentifier: string,
 			): Promise<Mobile.IDebugWebViewInfo[]>;
 
 			/**
@@ -659,7 +665,7 @@ declare global {
 			 * @returns {Promise<Mobile.IListEmulatorsOutput>} Dictionary with the following format: { ios: { devices: Mobile.IDeviceInfo[], errors: string[] }, android: { devices: Mobile.IDeviceInfo[], errors: string[]}}.
 			 */
 			getEmulatorImages(
-				options?: Mobile.IListEmulatorsOptions
+				options?: Mobile.IListEmulatorsOptions,
 			): Promise<Mobile.IListEmulatorsOutput>;
 
 			/**
@@ -674,11 +680,11 @@ declare global {
 			 * prompts the user for a manual choice or returns the first one for non interactive terminals.
 			 */
 			pickSingleDevice(
-				options: IPickSingleDeviceOptions
+				options: IPickSingleDeviceOptions,
 			): Promise<Mobile.IDevice>;
 
 			getPlatformsFromDeviceDescriptors(
-				deviceDescriptors: ILiveSyncDeviceDescriptor[]
+				deviceDescriptors: ILiveSyncDeviceDescriptor[],
 			): string[];
 		}
 
@@ -734,7 +740,7 @@ declare global {
 			mapAbstractToTcpPort(
 				deviceIdentifier: string,
 				appIdentifier: string,
-				framework: string
+				framework: string,
 			): Promise<string>;
 
 			/**
@@ -743,7 +749,7 @@ declare global {
 			 * @return {Mobile.IDeviceApplicationInformation[]} Returns array of applications information for the applications which are available for debugging.
 			 */
 			getDebuggableApps(
-				deviceIdentifier: string
+				deviceIdentifier: string,
 			): Promise<Mobile.IDeviceApplicationInformation[]>;
 
 			/**
@@ -756,7 +762,7 @@ declare global {
 			getMappedAbstractToTcpPorts(
 				deviceIdentifier: string,
 				appIdentifiers: string[],
-				framework: string
+				framework: string,
 			): Promise<IDictionary<number>>;
 
 			/**
@@ -767,7 +773,7 @@ declare global {
 			 */
 			getAppProcessId(
 				deviceIdentifier: string,
-				appIdentifier: string
+				appIdentifier: string,
 			): Promise<string>;
 
 			/**
@@ -778,7 +784,7 @@ declare global {
 			 * @returns {number} The TCP port that is used for the forwarding.
 			 */
 			forwardFreeTcpToAbstractPort(
-				portForwardInputData: IPortForwardData
+				portForwardInputData: IPortForwardData,
 			): Promise<number>;
 		}
 
@@ -840,7 +846,7 @@ declare global {
 				fileName: string,
 				localProjectRootPath: string,
 				onDeviceFileName: string,
-				deviceProjectRootPath: string
+				deviceProjectRootPath: string,
 			): Mobile.ILocalToDevicePathData;
 		}
 
@@ -895,7 +901,7 @@ declare global {
 			 * @returns {Promise<IStartEmulatorOutput>} Starts the emulator and returns the errors if some error occurs.
 			 */
 			startEmulator(
-				options: Mobile.IStartEmulatorOptions
+				options: Mobile.IStartEmulatorOptions,
 			): Promise<IStartEmulatorOutput>;
 
 			/**
@@ -916,7 +922,7 @@ declare global {
 			 * Returns array of all available android emulators - genymotion and native avd emulators and array of errors.
 			 */
 			getEmulatorImages(
-				adbDevicesOutput: string[]
+				adbDevicesOutput: string[],
 			): Promise<Mobile.IEmulatorImagesOutput>;
 			/**
 			 * Gets all identifiers of all running android emulators.
@@ -967,7 +973,7 @@ declare global {
 			 * @returns {Promise<IVirtualBoxEnumerateGuestPropertiesOutput>} - Returns a dictionary in the following format: { properties: string; error?: string; }
 			 */
 			enumerateGuestProperties(
-				id: string
+				id: string,
 			): Promise<IVirtualBoxEnumerateGuestPropertiesOutput>;
 		}
 
@@ -1012,7 +1018,7 @@ declare global {
 			 */
 			parseIniFile(
 				iniFilePath: string,
-				avdInfo?: Mobile.IAvdInfo
+				avdInfo?: Mobile.IAvdInfo,
 			): Mobile.IAvdInfo;
 		}
 
@@ -1056,7 +1062,7 @@ declare global {
 			launchApplication(
 				applicationPath: string,
 				appIdentifier: string,
-				options: IiOSSimLaunchApplicationOptions
+				options: IiOSSimLaunchApplicationOptions,
 			): Promise<any>;
 			printDeviceTypes(): Promise<any>;
 			sendNotification(notification: string, deviceId: string): Promise<void>;
@@ -1104,7 +1110,7 @@ declare global {
 		interface IiOSSimulatorService extends IEmulatorPlatformService {
 			postDarwinNotification(
 				notification: string,
-				deviceId: string
+				deviceId: string,
 			): Promise<void>;
 
 			/**
@@ -1206,34 +1212,34 @@ declare global {
 			getDeviceFileContent(
 				device: Mobile.IDevice,
 				deviceFilePath: string,
-				projectData: IProjectData
+				projectData: IProjectData,
 			): Promise<string>;
 		}
 
 		interface IEmulatorHelper {
 			mapAndroidApiLevelToVersion: IStringDictionary;
 			getEmulatorsFromAvailableEmulatorsOutput(
-				availableEmulatorsOutput: Mobile.IListEmulatorsOutput
+				availableEmulatorsOutput: Mobile.IListEmulatorsOutput,
 			): Mobile.IDeviceInfo[];
 			getErrorsFromAvailableEmulatorsOutput(
-				availableEmulatorsOutput: Mobile.IListEmulatorsOutput
+				availableEmulatorsOutput: Mobile.IListEmulatorsOutput,
 			): string[];
 			getEmulatorByImageIdentifier(
 				imageIdentifier: string,
-				emulators: Mobile.IDeviceInfo[]
+				emulators: Mobile.IDeviceInfo[],
 			): Mobile.IDeviceInfo;
 			getEmulatorByIdOrName(
 				emulatorIdOrName: string,
-				emulators: Mobile.IDeviceInfo[]
+				emulators: Mobile.IDeviceInfo[],
 			): Mobile.IDeviceInfo;
 			getEmulatorByStartEmulatorOptions(
 				options: Mobile.IStartEmulatorOptions,
-				emulators: Mobile.IDeviceInfo[]
+				emulators: Mobile.IDeviceInfo[],
 			): Mobile.IDeviceInfo;
 			isEmulatorRunning(emulator: Mobile.IDeviceInfo): boolean;
 			setRunningAndroidEmulatorProperties(
 				emulatorId: string,
-				emulator: Mobile.IDeviceInfo
+				emulator: Mobile.IDeviceInfo,
 			): void;
 		}
 
@@ -1286,13 +1292,13 @@ declare global {
 			 * Computes the shasums of localToDevicePaths and updates hash file on device
 			 */
 			updateHashes(
-				localToDevicePaths: Mobile.ILocalToDevicePathData[]
+				localToDevicePaths: Mobile.ILocalToDevicePathData[],
 			): Promise<void>;
 			/**
 			 * Computes the shasums of localToDevicePaths and removes them from hash file on device
 			 */
 			removeHashes(
-				localToDevicePaths: Mobile.ILocalToDevicePathData[]
+				localToDevicePaths: Mobile.ILocalToDevicePathData[],
 			): Promise<boolean>;
 
 			/**
@@ -1309,7 +1315,7 @@ declare global {
 			 */
 			generateHashesFromLocalToDevicePaths(
 				localToDevicePaths: Mobile.ILocalToDevicePathData[],
-				initialShasums?: IStringDictionary
+				initialShasums?: IStringDictionary,
 			): Promise<IStringDictionary>;
 
 			/**
@@ -1318,7 +1324,7 @@ declare global {
 			 * @returns {string[]} DevicePaths of all elements from the input localToDevicePaths.
 			 */
 			getDevicePaths(
-				localToDevicePaths: Mobile.ILocalToDevicePathData[]
+				localToDevicePaths: Mobile.ILocalToDevicePathData[],
 			): string[];
 
 			/**
@@ -1329,7 +1335,7 @@ declare global {
 			 */
 			getChangedShasums(
 				oldShasums: IStringDictionary,
-				currentShasums: IStringDictionary
+				currentShasums: IStringDictionary,
 			): IStringDictionary;
 		}
 
@@ -1371,7 +1377,7 @@ declare global {
 			 */
 			handleErrors(
 				errors: IAndroidDebugBridgeError[],
-				treatErrorsAsWarnings?: boolean
+				treatErrorsAsWarnings?: boolean,
 			): void;
 		}
 
@@ -1401,77 +1407,77 @@ declare global {
 		install(
 			ipaPath: string,
 			deviceIdentifiers: string[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		uninstall(
 			appIdentifier: string,
 			deviceIdentifiers: string[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		startLookingForDevices(
 			deviceFoundCallback: DeviceInfoCallback,
 			deviceUpdatedCallback: DeviceInfoCallback,
 			deviceLostCallback: DeviceInfoCallback,
-			options?: Mobile.IDeviceLookingOptions
+			options?: Mobile.IDeviceLookingOptions,
 		): Promise<void>;
 
 		startDeviceLog(deviceIdentifier: string): void;
 
 		apps(
 			deviceIdentifiers: string[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceAppInfo>;
 
 		listDirectory(
 			listArray: IOSDeviceLib.IReadOperationData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceMultipleResponse>;
 
 		readFiles(
 			deviceFilePaths: IOSDeviceLib.IReadOperationData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		downloadFiles(
 			deviceFilePaths: IOSDeviceLib.IFileOperationData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		uploadFiles(
 			files: IOSDeviceLib.IUploadFilesData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		deleteFiles(
 			deleteArray: IOSDeviceLib.IDeleteFileData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		start(
 			startArray: IOSDeviceLib.IIOSApplicationData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		stop(
 			stopArray: IOSDeviceLib.IIOSApplicationData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		postNotification(
 			postNotificationArray: IOSDeviceLib.IPostNotificationData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		awaitNotificationResponse(
 			awaitNotificationResponseArray: IOSDeviceLib.IAwaitNotificatioNResponseData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IOSDeviceResponse>;
 
 		connectToPort(
 			connectToPortArray: IOSDeviceLib.IConnectToPortData[],
-			errorHandler?: DeviceOperationErrorHandler
+			errorHandler?: DeviceOperationErrorHandler,
 		): Promise<IDictionary<IOSDeviceLib.IConnectToPortResponse[]>>;
 
 		setShouldDispose(shouldDispose: boolean): void;
@@ -1480,7 +1486,7 @@ declare global {
 	type DeviceOperationErrorHandler = (err: IOSDeviceLib.IDeviceError) => void;
 
 	type DeviceInfoCallback = (
-		deviceInfo: IOSDeviceLib.IDeviceActionInfo
+		deviceInfo: IOSDeviceLib.IDeviceActionInfo,
 	) => void;
 
 	type IOSDeviceResponse = IDictionary<IOSDeviceLib.IDeviceResponse[]>;

package/lib/common/file-system.js

@@ -18,9 +18,9 @@ const shelljs = require("shelljs");
 const helpers_1 = require("./helpers");
 const constants_1 = require("../constants");
 const os_1 = require("os");
-const detectNewline = require("detect-newline");
 const archiver_1 = require("archiver");
 const mkdirp = require("mkdirp");
+const detectNewline = require("detect-newline");
 let FileSystem = FileSystem_1 = class FileSystem {
     constructor($injector) {
         this.$injector = $injector;

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.INFO;
+            : constants_1.LoggerLevel.WARN;
     }
     initialize(opts) {
         opts = opts || {};

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

@@ -45,6 +45,10 @@ class AndroidDevice {
             identifier: this.identifier,
             displayName: details.name,
             model: details.model,
+            abis: [
+                ...details["cpu.abilist64"].split(","),
+                ...details["cpu.abilist32"].split(","),
+            ],
             version,
             vendor: details.brand,
             platform: this.$devicePlatformsConstants.Android,
@@ -58,8 +62,10 @@ class AndroidDevice {
             ? [constants_1.DeviceConnectionType.Local]
             : [constants_1.DeviceConnectionType.USB];
         if (this.isEmulator) {
-            this.deviceInfo.displayName = await this.$androidEmulatorServices.getRunningEmulatorName(this.identifier);
-            this.deviceInfo.imageIdentifier = await this.$androidEmulatorServices.getRunningEmulatorImageIdentifier(this.identifier);
+            this.deviceInfo.displayName =
+                await this.$androidEmulatorServices.getRunningEmulatorName(this.identifier);
+            this.deviceInfo.imageIdentifier =
+                await this.$androidEmulatorServices.getRunningEmulatorImageIdentifier(this.identifier);
         }
         this.$logger.trace(this.deviceInfo);
     }

package/lib/common/mobile/mobile-core/devices-service.js

@@ -396,7 +396,7 @@ class DevicesService extends events_1.EventEmitter {
                 preErrorMsg = "Multiple errors were thrown:" + os_1.EOL;
             }
             const errorMessage = `${preErrorMsg}${errors
-                .map((e) => e.message || e)
+                .map((e) => e.stack || e.message || e)
                 .join(os_1.EOL)}`;
             this.$errors.fail(errorMessage);
         }

package/lib/common/plist-parser.js

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

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/services/hooks-service.js

@@ -89,7 +89,7 @@ class HooksService {
         }
         catch (err) {
             this.$logger.trace(`Failed during hook execution ${hookName}.`);
-            this.$errors.fail(err.message || err);
+            this.$errors.fail(err.stack || err.message || err);
         }
         return _.flatten(results);
     }