fix: project detection

Author: rigor789

lib/common/helpers.ts

@@ -73,6 +73,7 @@ function isInstallingNativeScriptGloballyWithNpm(): boolean {
 	const isGlobalCommand = doesCurrentNpmCommandMatch([/^--global$/, /^-g$/]);
 	const hasNativeScriptPackage = doesCurrentNpmCommandMatch([
 		/^nativescript(@.*)?$/,
+		/nativescript-(.*)\.tgz?$/,
 	]);
 
 	return isInstallCommand && isGlobalCommand && hasNativeScriptPackage;
@@ -84,6 +85,7 @@ function isInstallingNativeScriptGloballyWithYarn(): boolean {
 	const isGlobalCommand = doesCurrentNpmCommandMatch([/^global$/]);
 	const hasNativeScriptPackage = doesCurrentNpmCommandMatch([
 		/^nativescript(@.*)?$/,
+		/nativescript-(.*)\.tgz?$/,
 	]);
 
 	return isInstallCommand && isGlobalCommand && hasNativeScriptPackage;

lib/common/project-helper.ts

@@ -3,6 +3,7 @@ import * as _ from "lodash";
 import { IErrors, IFileSystem, IProjectHelper } from "./declarations";
 import { IOptions } from "../declarations";
 import { injector } from "./yok";
+import { SCOPED_TNS_CORE_MODULES, TNS_CORE_MODULES_NAME } from "../constants";
 
 export class ProjectHelper implements IProjectHelper {
 	constructor(
@@ -75,7 +76,10 @@ export class ProjectHelper implements IProjectHelper {
 	private isProjectFileCorrect(projectFilePath: string): boolean {
 		try {
 			const fileContent = this.$fs.readText(projectFilePath);
-			return fileContent.includes("nativescript");
+			return (
+				fileContent.includes(SCOPED_TNS_CORE_MODULES) ||
+				fileContent.includes(TNS_CORE_MODULES_NAME)
+			);
 		} catch (err) {
 			this.$errors.fail(
 				"The project file is corrupted. Additional technical information: %s",

test/plugins-service.ts

@@ -245,7 +245,7 @@ function createProjectFile(testInjector: IInjector): string {
 
 	const packageJsonData = {
 		name: "testModuleName",
-		description: "nativescript", // important for project file checks - currently just looking for the nativescript keyword
+		description: "@nativescript/core", // important for project file checks - currently just looking for the @nativescript/core keyword
 		version: "0.1.0",
 		devDependencies: {
 			"tns-android": "1.4.0",