Merge pull request #4668 from easadev/feat/cli-4667/support-yarn-workspace

rosen-vladimirov · web-flow · commit 8722364da49c · 2019-06-25T13:14:52.000+03:00
feat(yarn): yarn support for workspaces
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -42,7 +42,7 @@ export class PluginsService implements IPluginsService {
 		}
 
 		const name = (await this.$packageManager.install(plugin, projectData.projectDir, this.npmInstallOptions)).name;
-		const pathToRealNpmPackageJson = path.join(projectData.projectDir, "node_modules", name, "package.json");
+		const pathToRealNpmPackageJson = this.getPackageJsonFilePathForModule(name, projectData.projectDir);
 		const realNpmPackageJson = this.$fs.readJson(pathToRealNpmPackageJson);
 
 		if (realNpmPackageJson.nativescript) {
@@ -215,7 +215,10 @@ export class PluginsService implements IPluginsService {
 	}
 
 	private getPackageJsonFilePathForModule(moduleName: string, projectDir: string): string {
-		return path.join(this.getNodeModulesPath(projectDir), moduleName, "package.json");
+		const pathToJsonFile = require.resolve(`${moduleName}/package.json`, {
+				paths: [projectDir]
+		});
+		return pathToJsonFile;
 	}
 
 	private getDependencies(projectDir: string): string[] {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export class PluginsService implements IPluginsService {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`const name = (await this.$packageManager.install(plugin, projectData.projectDir, this.npmInstallOptions)).name;`
`45`		`- const pathToRealNpmPackageJson = path.join(projectData.projectDir, "node_modules", name, "package.json");`
	`45`	`+ const pathToRealNpmPackageJson = this.getPackageJsonFilePathForModule(name, projectData.projectDir);`
`46`	`46`	`const realNpmPackageJson = this.$fs.readJson(pathToRealNpmPackageJson);`
`47`	`47`
`48`	`48`	`if (realNpmPackageJson.nativescript) {`
`@@ -215,7 +215,10 @@ export class PluginsService implements IPluginsService {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`private getPackageJsonFilePathForModule(moduleName: string, projectDir: string): string {`
`218`		`- return path.join(this.getNodeModulesPath(projectDir), moduleName, "package.json");`
	`218`	+ const pathToJsonFile = require.resolve(`${moduleName}/package.json`, {
	`219`	`+ paths: [projectDir]`
	`220`	`+ });`
	`221`	`+ return pathToJsonFile;`
`219`	`222`	`}`
`220`	`223`
`221`	`224`	`private getDependencies(projectDir: string): string[] {`