Skip to content

Yosifov/fix init cmd #2625

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
Mar 20, 2017
Merged

Yosifov/fix init cmd #2625

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
87b8928
Fix the version selection on init
Mar 20, 2017
59c63b2
Remove trailing space - lint error
Mar 20, 2017
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
2 changes: 1 addition & 1 deletion lib/declarations.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
interface INodePackageManager {
install(packageName: string, pathToSave: string, config?: any): Promise<any>;
uninstall(packageName: string, config?: any, path?: string): Promise<any>;
view(packageName: string, config: any): Promise<any>;
view(packageName: string, config: Object): Promise<any>;
search(filter: string[], config: any): Promise<any>;
}

Expand Down
6 changes: 4 additions & 2 deletions lib/node-package-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ export class NodePackageManager implements INodePackageManager {
return this.$childProcess.exec(`npm search ${args.join(" ")}`);
}

public async view(packageName: string, config: any): Promise<any> {
let flags = this.getFlagsString(config, false);
public async view(packageName: string, config: Object): Promise<any> {
const wrappedConfig = _.extend({}, config, { json: true }); // always require view response as JSON

let flags = this.getFlagsString(wrappedConfig, false);
let viewResult: any;
try {
viewResult = await this.$childProcess.exec(`npm view ${packageName} ${flags}`);
Expand Down
4 changes: 2 additions & 2 deletions lib/npm-installation-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
if (semver.satisfies(latestVersion, cliVersionRange)) {
return latestVersion;
}
let data = await this.$npm.view(packageName, { json: true, "versions": true });
let data = await this.$npm.view(packageName, { "versions": true });

return semver.maxSatisfying(data, cliVersionRange) || latestVersion;
}
Expand Down Expand Up @@ -122,7 +122,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
* because npm view doens't work with those
*/
private async getVersion(packageName: string, version: string): Promise<string> {
let data: any = await this.$npm.view(packageName, { json: true, "dist-tags": true });
let data: any = await this.$npm.view(packageName, { "dist-tags": true });
this.$logger.trace("Using version %s. ", data[version]);

return data[version];
Expand Down
4 changes: 2 additions & 2 deletions lib/services/init-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ export class InitService implements IInitService {
return this.buildVersionData(latestVersion);
}

let data: any = await this.$npm.view(packageName, "versions");
let versions = _.filter(data[latestVersion].versions, (version: string) => semver.gte(version, InitService.MIN_SUPPORTED_FRAMEWORK_VERSIONS[packageName]));
let allVersions: any = await this.$npm.view(packageName, { "versions": true });
let versions = _.filter(allVersions, (version: string) => semver.gte(version, InitService.MIN_SUPPORTED_FRAMEWORK_VERSIONS[packageName]));
if (versions.length === 1) {
this.$logger.info(`Only ${versions[0]} version is available for ${packageName}.`);
return this.buildVersionData(versions[0]);
Expand Down