Skip to content

Commit 3b17dcc

Browse files
committed
Merge pull request #20 from NativeScript/fatme/static-config
Static config
2 parents ebd336c + 0fda739 commit 3b17dcc

File tree

6 files changed

+27
-12
lines changed

6 files changed

+27
-12
lines changed

lib/bootstrap.ts

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ $injector.requireCommand("build", "./commands/build");
2222

2323
$injector.require("npm", "./node-package-manager");
2424
$injector.require("propertiesParser", "./properties-parser");
25+
$injector.require("config", "./config");

lib/config.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
///<reference path=".d.ts"/>
2+
3+
import path = require("path");
4+
5+
export class StaticConfig implements IStaticConfig {
6+
public PROJECT_FILE_NAME = ".tnsproject";
7+
public CLIENT_NAME = "tns";
8+
public ANALYTICS_API_KEY = "";
9+
10+
public version = require("../package.json").version;
11+
12+
public get helpTextPath() {
13+
return path.join(__dirname, "../resources/help.txt");
14+
}
15+
}
16+
$injector.register("staticConfig", StaticConfig);

lib/declarations.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ interface INodePackageManager {
66

77
interface IPropertiesParser {
88
createEditor(filePath: string): IFuture<any>;
9-
}
9+
}
10+
11+
interface IStaticConfig extends Config.IStaticConfig { }

lib/nativescript-cli.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,8 @@ import errors = require("./common/errors");
1111
errors.installUncaughtExceptionListener();
1212

1313
$injector.register("config", {
14-
CI_LOGGER1: false,
15-
PROJECT_FILE_NAME: ".tnsproject",
16-
DEBUG: process.env.NATIVESCRIPT_DEBUG,
17-
version: require("../package.json").version,
18-
helpTextPath: path.join(__dirname, "../resources/help.txt"),
19-
client: "tns"
14+
CI_LOGGER: false,
15+
DEBUG: process.env.NATIVESCRIPT_DEBUG
2016
});
2117

2218
var dispatcher = $injector.resolve("dispatcher");

lib/services/project-service.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ProjectData implements IProjectData {
1818
constructor(private $fs: IFileSystem,
1919
private $errors: IErrors,
2020
private $projectHelper: IProjectHelper,
21-
private $config: IConfig) {
21+
private $staticConfig: IStaticConfig) {
2222
this.initializeProjectData().wait();
2323
}
2424

@@ -30,7 +30,7 @@ class ProjectData implements IProjectData {
3030
this.projectDir = projectDir;
3131
this.projectName = path.basename(projectDir);
3232
this.platformsDir = path.join(projectDir, "platforms");
33-
this.projectFilePath = path.join(projectDir, this.$config.PROJECT_FILE_NAME);
33+
this.projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
3434

3535
if (this.$fs.exists(this.projectFilePath).wait()) {
3636
var fileContent = this.$fs.readJson(this.projectFilePath).wait();
@@ -50,7 +50,7 @@ export class ProjectService implements IProjectService {
5050
private $fs: IFileSystem,
5151
private $projectTemplatesService: IProjectTemplatesService,
5252
private $projectHelper: IProjectHelper,
53-
private $config) { }
53+
private $staticConfig: IStaticConfig) { }
5454

5555
public createProject(projectName: string, projectId: string): IFuture<void> {
5656
return(() => {
@@ -128,7 +128,7 @@ export class ProjectService implements IProjectService {
128128
this.$fs.createDirectory(path.join(projectDir, "hooks")).wait();
129129

130130
var projectData = { id: projectId };
131-
this.$fs.writeFile(path.join(projectDir, this.$config.PROJECT_FILE_NAME), JSON.stringify(projectData)).wait();
131+
this.$fs.writeFile(path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME), JSON.stringify(projectData)).wait();
132132
}).future<void>()();
133133
}
134134

0 commit comments

Comments
 (0)