Skip to content

fix: install the latest compatible v2 templates in stead of the latest tag #4088

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
DimitarTachev merged 2 commits into from
Nov 2, 2018
Merged

fix: install the latest compatible v2 templates in stead of the latest tag #4088

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
07ff83a
fix: install the latest compatible v2 templates in stead of the lates…
DimitarTachev Nov 2, 2018
9605c24
fix: fix: install the latest compatible v2 templates in stead of the …
DimitarTachev Nov 2, 2018
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
4 changes: 4 additions & 0 deletions lib/services/project-templates-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
}

const templateName = constants.RESERVED_TEMPLATE_NAMES[name.toLowerCase()] || name;
if (!this.$fs.exists(templateName)) {
version = version || await this.$npmInstallationManager.getLatestCompatibleVersion(templateName);
}

const fullTemplateName = version ? `${templateName}@${version}` : templateName;
const templatePackageJsonContent = await this.getTemplatePackageJsonContent(fullTemplateName);
const templateVersion = await this.getTemplateVersion(fullTemplateName);
Expand Down
12 changes: 8 additions & 4 deletions test/project-templates-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import { format } from "util";

let isDeleteDirectoryCalledForNodeModulesDir = false;
const nativeScriptValidatedTemplatePath = "nsValidatedTemplatePath";
const compatibleTemplateVersion = "1.2.3";

function createTestInjector(configuration: { shouldNpmInstallThrow?: boolean, packageJsonContent?: any } = {}): IInjector {
const injector = new Yok();
injector.register("errors", stubs.ErrorsStub);
injector.register("logger", stubs.LoggerStub);
injector.register("fs", {
exists: (pathToCheck: string) => true,
exists: (pathToCheck: string) => false,

readJson: (pathToFile: string) => configuration.packageJsonContent || {},

Expand Down Expand Up @@ -42,6 +43,9 @@ function createTestInjector(configuration: { shouldNpmInstallThrow?: boolean, pa
}

return Promise.resolve(nativeScriptValidatedTemplatePath);
},
getLatestCompatibleVersion: (packageName: string) => {
return compatibleTemplateVersion;
}
});

Expand Down Expand Up @@ -164,7 +168,7 @@ describe("project-templates-service", () => {
const fs = testInjector.resolve<IFileSystem>("fs");
fs.exists = (localPath: string): boolean => path.basename(localPath) !== constants.PACKAGE_JSON_FILE_NAME;
const pacoteService = testInjector.resolve<IPacoteService>("pacoteService");
pacoteService.manifest = () => Promise.resolve({ });
pacoteService.manifest = () => Promise.resolve({});
await projectTemplatesService.prepareTemplate(localTemplatePath, "tempFolder");
assert.deepEqual(dataSentToGoogleAnalytics, [
{
Expand Down Expand Up @@ -215,7 +219,7 @@ describe("project-templates-service", () => {
const notSupportedVersionString = "not supported version";
const testInjector = createTestInjector({ packageJsonContent: { nativescript: { templateVersion: notSupportedVersionString } } });
const projectTemplatesService = testInjector.resolve<IProjectTemplatesService>("projectTemplatesService");
const expectedError = format(constants.ProjectTemplateErrors.InvalidTemplateVersionStringFormat, 'tns-template-hello-world-ts', notSupportedVersionString);
const expectedError = format(constants.ProjectTemplateErrors.InvalidTemplateVersionStringFormat, `tns-template-hello-world-ts@${compatibleTemplateVersion}`, notSupportedVersionString);
await assert.isRejected(projectTemplatesService.prepareTemplate("typescript", "tempFolder"), expectedError);
});

Expand All @@ -238,7 +242,7 @@ describe("project-templates-service", () => {
{
name: "is correct when scoped package name without version is passed",
templateName: "@nativescript/vue-template",
expectedVersion: "",
expectedVersion: compatibleTemplateVersion,
expectedTemplateName: "@nativescript/vue-template"
},
{
Expand Down