Merge branch 'master' into mdonev/deprecated-api-fix

elena-p · web-flow · commit b44df236f924 · 2019-10-23T11:35:50.000+03:00
diff --git a/nativescript-angular/bin/update-app-ng-deps b/nativescript-angular/bin/update-app-ng-deps
@@ -56,7 +56,7 @@ function updateDeps(deps, devDeps, newDeps) {
 }
 
 const pluginDeps = pluginPackageJson.peerDependencies;
-const projectPath = process.env.INIT_CWD || process.cwd() || path.dirname(path.dirname(pluginPath));
+const projectPath = process.env.INIT_CWD || path.dirname(path.dirname(path.dirname(pluginPath)));
 const appPackageJsonPath = path.join(projectPath, "package.json");
 const appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8"));
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function updateDeps(deps, devDeps, newDeps) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`const pluginDeps = pluginPackageJson.peerDependencies;`
`59`		`-const projectPath = process.env.INIT_CWD \|\| process.cwd() \|\| path.dirname(path.dirname(pluginPath));`
	`59`	`+const projectPath = process.env.INIT_CWD \|\| path.dirname(path.dirname(path.dirname(pluginPath)));`
`60`	`60`	`const appPackageJsonPath = path.join(projectPath, "package.json");`
`61`	`61`	`const appPackageJson = JSON.parse(fs.readFileSync(appPackageJsonPath, "utf8"));`
`62`	`62`