Merge pull request #4321 from NativeScript/vladimirov/fix-getting-paths-to-resources

rosen-vladimirov · web-flow · commit 3d9efd32e596 · 2019-01-29T03:44:36.000-08:00
fix: incorrect paths to CLI resources and files break commands
diff --git a/lib/common/services/micro-templating-service.ts b/lib/common/services/micro-templating-service.ts
@@ -1,6 +1,6 @@
 import * as util from "util";
 import * as os from "os";
-import * as constants from "../constants";
+import * as constants from "../../constants";
 import { formatListOfNames } from '../helpers';
 
 export class MicroTemplateService implements IMicroTemplateService {
diff --git a/lib/config.ts b/lib/config.ts
@@ -42,7 +42,7 @@ export class StaticConfig implements IStaticConfig {
 	public get PROFILE_DIR_NAME(): string {
 		return ".nativescript-cli";
 	}
-	public RESOURCE_DIR_PATH = path.join(__dirname, "../../resources");
+	public RESOURCE_DIR_PATH = path.join(__dirname, "..", "resources");
 
 	constructor(private $injector: IInjector) {
 	}
@@ -118,7 +118,7 @@ export class StaticConfig implements IStaticConfig {
 	}
 
 	public get HTML_COMMON_HELPERS_DIR(): string {
-		return path.join(__dirname, "lib", "common", "docs", "helpers");
+		return path.join(__dirname, "common", "docs", "helpers");
 	}
 
 	private async getAdbFilePathCore(): Promise<string> {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export class StaticConfig implements IStaticConfig {`
`42`	`42`	`public get PROFILE_DIR_NAME(): string {`
`43`	`43`	`return ".nativescript-cli";`
`44`	`44`	`}`
`45`		`- public RESOURCE_DIR_PATH = path.join(__dirname, "../../resources");`
	`45`	`+ public RESOURCE_DIR_PATH = path.join(__dirname, "..", "resources");`
`46`	`46`
`47`	`47`	`constructor(private $injector: IInjector) {`
`48`	`48`	`}`
`@@ -118,7 +118,7 @@ export class StaticConfig implements IStaticConfig {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`public get HTML_COMMON_HELPERS_DIR(): string {`
`121`		`- return path.join(__dirname, "lib", "common", "docs", "helpers");`
	`121`	`+ return path.join(__dirname, "common", "docs", "helpers");`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`private async getAdbFilePathCore(): Promise<string> {`