Skip to content

delete all unnecessary keys from app/package.json #2346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2016
Merged

delete all unnecessary keys from app/package.json #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8712a7
delete all unnecessary keys from app/package.json
Plamen5kov Dec 13, 2016
853c94c
removed wrapping in futures where it's not necessary
Plamen5kov Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,23 @@
{
"type": "node",
"request": "launch",
"name": "Launch Program (Node 6+)",
"program": "${workspaceRoot}/lib/nativescript-cli.js",
"cwd": "${workspaceRoot}",
"cwd": "${workspaceRoot}/scratch",
"sourceMaps": true,
// define the arguments that you would like to pass to CLI, for example
// "args": [ "build", "android", "--justlaunch" ]
"args": [
"name": "Launch CLI (Node 6+)",
"program": "${workspaceRoot}/lib/nativescript-cli.js",

]
// example commands
"args": [ "create", "cliapp"]
// "args": [ "platform", "add", "[email protected]", "--path", "cliapp"]
// "args": [ "platform", "remove", "android", "--path", "cliapp"]
// "args": [ "plugin", "add", "nativescript-barcodescanner", "--path", "cliapp"]
// "args": [ "plugin", "remove", "nativescript-barcodescanner", "--path", "cliapp"]
// "args": [ "build", "android", "--path", "cliapp"]
// "args": [ "run", "android", "--path", "cliapp"]
// "args": [ "debug", "android", "--path", "cliapp"]
// "args": [ "livesync", "android", "--path", "cliapp"]
// "args": [ "livesync", "android", "--watch", "--path", "cliapp"]
},

{
// in case you want to debug a single test, modify it's code to be `it.only(...` instead of `it(...`
"type": "node",
Expand All @@ -34,7 +40,7 @@
"--harmony"
],
"request": "launch",
"name": "Launch Program (Node 4, Node 5)",
"name": "Launch CLI (Node 4, Node 5)",
"program": "${workspaceRoot}/lib/nativescript-cli.js",
"cwd": "${workspaceRoot}",
"sourceMaps": true,
Expand Down
2 changes: 2 additions & 0 deletions lib/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export class PackageVersion {
static LATEST = "latest";
}

export let PackageJsonKeysToKeep : Array<String> = ["name", "main", "android", "version"];

export class SaveOptions {
static PRODUCTION = "save";
static DEV = "save-dev";
Expand Down
35 changes: 27 additions & 8 deletions lib/services/project-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ export class ProjectService implements IProjectService {
try {
//TODO: plamen5kov: move copy of template and npm uninstall in prepareTemplate logic
this.createProjectCore(projectDir, appPath, projectId).wait();
this.mergeProjectAndTemplateProperties(projectDir, appPath); //merging dependencies from template (dev && prod)
let templatePackageJsonData = this.getDataFromJson(appPath);
this.mergeProjectAndTemplateProperties(projectDir, templatePackageJsonData); //merging dependencies from template (dev && prod)
this.removeMergedDependencies(projectDir, templatePackageJsonData);
this.$npm.install(projectDir, projectDir, { "ignore-scripts": this.$options.ignoreScripts }).wait();
selectedTemplate = selectedTemplate || "";
let templateName = (constants.RESERVED_TEMPLATE_NAMES[selectedTemplate.toLowerCase()] || selectedTemplate/*user template*/) || constants.RESERVED_TEMPLATE_NAMES["default"];
Expand All @@ -93,26 +95,43 @@ export class ProjectService implements IProjectService {
}).future<void>()();
}

private mergeProjectAndTemplateProperties(projectDir: string, templatePath: string): void {
private getDataFromJson(templatePath: string): any {
let templatePackageJsonPath = path.join(templatePath, constants.PACKAGE_JSON_FILE_NAME);
if(this.$fs.exists(templatePackageJsonPath)) {
let templatePackageJsonData = this.$fs.readJson(templatePackageJsonPath);
return templatePackageJsonData;
} else {
this.$logger.trace(`Template ${templatePath} does not have ${constants.PACKAGE_JSON_FILE_NAME} file.`);
}
return null;
}

private removeMergedDependencies(projectDir: string, templatePackageJsonData: any) : void {
let extractedTemplatePackageJsonPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.PACKAGE_JSON_FILE_NAME);
for(let key in templatePackageJsonData) {
if(constants.PackageJsonKeysToKeep.indexOf(key) === -1) {
delete templatePackageJsonData[key];
}
}

this.$logger.trace("Deleting unnecessary information from template json.");
this.$fs.writeJson(extractedTemplatePackageJsonPath, templatePackageJsonData);
}

if (this.$fs.exists(templatePackageJsonPath)) {
private mergeProjectAndTemplateProperties(projectDir: string, templatePackageJsonData: any): void {
if(templatePackageJsonData) {
let projectPackageJsonPath = path.join(projectDir, constants.PACKAGE_JSON_FILE_NAME);
let projectPackageJsonData = this.$fs.readJson(projectPackageJsonPath);
this.$logger.trace("Initial project package.json data: ", projectPackageJsonData);
let templatePackageJsonData = this.$fs.readJson(templatePackageJsonPath);
if (projectPackageJsonData.dependencies || templatePackageJsonData.dependencies) {
if(projectPackageJsonData.dependencies || templatePackageJsonData.dependencies) {
projectPackageJsonData.dependencies = this.mergeDependencies(projectPackageJsonData.dependencies, templatePackageJsonData.dependencies);
}

if (projectPackageJsonData.devDependencies || templatePackageJsonData.devDependencies) {
projectPackageJsonData.devDependencies = this.mergeDependencies(projectPackageJsonData.devDependencies, templatePackageJsonData.devDependencies);
}

this.$logger.trace("New project package.json data: ", projectPackageJsonData);
this.$fs.writeJson(projectPackageJsonPath, projectPackageJsonData);
} else {
this.$logger.trace(`Template ${templatePath} does not have ${constants.PACKAGE_JSON_FILE_NAME} file.`);
}
}

Expand Down