Skip to content

Commit 201ac02

Browse files
Fatme HavaluovaFatme Havaluova
Fatme Havaluova
authored and
Fatme Havaluova
committed
Sync with latest common lib
1 parent d554021 commit 201ac02

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

lib/commands/create-project.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
export class CreateProjectCommand implements ICommand {
44
constructor(private $projectService: IProjectService) { }
55

6+
public enableHooks = false;
7+
68
execute(args: string[]): IFuture<void> {
79
return (() => {
810
this.$projectService.createProject(args[0]).wait();

lib/declarations.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ interface INpmInstallOptions {
1414

1515
interface IStaticConfig extends Config.IStaticConfig { }
1616

17+
interface IConfiguration extends Config.IConfig { }
18+
1719
interface IApplicationPackage {
1820
packageName: string;
1921
time: Date;

lib/nativescript-cli.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import path = require("path");
55

6-
require("./common/extensions");
76
require("./bootstrap");
87
require("./options");
98

@@ -12,11 +11,8 @@ errors.installUncaughtExceptionListener();
1211

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

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

lib/options.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import path = require("path");
44
import helpers = require("./common/helpers");
5+
import commonOptions = require("./common/options");
56
import osenv = require("osenv");
67

78
var knownOpts:any = {
@@ -27,8 +28,12 @@ var knownOpts:any = {
2728
"p" : "path"
2829
};
2930

31+
_.extend(knownOpts, commonOptions.knownOpts);
32+
_.extend(shorthands, commonOptions.shorthands);
33+
3034
var defaultProfileDir = path.join(osenv.home(), ".nativescript-cli");
31-
var parsed = helpers.getParsedOptions(knownOpts, shorthands, defaultProfileDir);
35+
var parsed = helpers.getParsedOptions(knownOpts, shorthands);
36+
parsed["profile-dir"] = parsed["profile-dir"] || defaultProfileDir;
3237

3338
Object.keys(parsed).forEach((opt) => exports[opt] = parsed[opt]);
3439

0 commit comments

Comments
 (0)