From 4bd7cceabb4fb2aaa7a776b54617834522a69541 Mon Sep 17 00:00:00 2001 From: Ivan Banov Date: Wed, 29 Jun 2022 18:09:38 +0200 Subject: [PATCH 1/3] Change snapshot timestamp position to render before of the custom tag --- packages/assemble-release-plan/src/index.test.ts | 2 +- packages/assemble-release-plan/src/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/assemble-release-plan/src/index.test.ts b/packages/assemble-release-plan/src/index.test.ts index 6b6cbc5f1..0a7ab0d19 100644 --- a/packages/assemble-release-plan/src/index.test.ts +++ b/packages/assemble-release-plan/src/index.test.ts @@ -54,7 +54,7 @@ describe("assemble-release-plan", () => { ); expect(releases.length).toBe(1); - expect(/0\.0\.0-foo-\d{14}/.test(releases[0].newVersion)).toBeTruthy(); + expect(/0\.0\.0-\d{14}-foo/.test(releases[0].newVersion)).toBeTruthy(); }); it("should assemble release plan with multiple packages", () => { diff --git a/packages/assemble-release-plan/src/index.ts b/packages/assemble-release-plan/src/index.ts index f302369c2..2536f56cb 100644 --- a/packages/assemble-release-plan/src/index.ts +++ b/packages/assemble-release-plan/src/index.ts @@ -40,7 +40,7 @@ function getSnapshotSuffix(snapshot?: string | boolean): string | undefined { if (typeof snapshot === "string") tag = `-${snapshot}`; - return `${tag}-${dateAndTime}`; + return `-${dateAndTime}${tag}`; } function getNewVersion( From 643b3538c99b165b12794d963d41c46be63c96ad Mon Sep 17 00:00:00 2001 From: Ivan Banov Date: Wed, 29 Jun 2022 18:16:18 +0200 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9D=20Add=20changeset?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/tiny-roses-kiss.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tiny-roses-kiss.md diff --git a/.changeset/tiny-roses-kiss.md b/.changeset/tiny-roses-kiss.md new file mode 100644 index 000000000..c6a79c1cc --- /dev/null +++ b/.changeset/tiny-roses-kiss.md @@ -0,0 +1,5 @@ +--- +"@changesets/assemble-release-plan": minor +--- + +Change snapshot timestamp position to render before of the custom tag From 79180be7145a039434fca88a05fc62f5a54342c9 Mon Sep 17 00:00:00 2001 From: Ivan Banov Date: Wed, 29 Jun 2022 18:25:55 +0200 Subject: [PATCH 3/3] Fix tests --- packages/cli/src/commands/version/version.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cli/src/commands/version/version.test.ts b/packages/cli/src/commands/version/version.test.ts index cf58af328..3133c5cf1 100644 --- a/packages/cli/src/commands/version/version.test.ts +++ b/packages/cli/src/commands/version/version.test.ts @@ -644,14 +644,14 @@ describe("snapshot release", () => { expect(getPkgJSON("pkg-a", spy.mock.calls)).toEqual( expect.objectContaining({ name: "pkg-a", - version: expect.stringContaining("0.0.0-experimental-") + version: expect.stringMatching(/0\.0\.0-\d+-experimental/) }) ); expect(getPkgJSON("pkg-b", spy.mock.calls)).toEqual( expect.objectContaining({ name: "pkg-b", - version: expect.stringContaining("0.0.0-experimental-") + version: expect.stringMatching(/0\.0\.0-\d+-experimental/) }) ); }); @@ -786,14 +786,14 @@ describe("snapshot release", () => { expect(getPkgJSON("pkg-a", spy.mock.calls)).toEqual( expect.objectContaining({ name: "pkg-a", - version: expect.stringContaining("1.1.0-experimental-") + version: expect.stringMatching(/1\.1\.0-\d+-experimental/) }) ); expect(getPkgJSON("pkg-b", spy.mock.calls)).toEqual( expect.objectContaining({ name: "pkg-b", - version: expect.stringContaining("1.0.1-experimental-") + version: expect.stringMatching(/1\.0\.1-\d+-experimental/) }) ); });