Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/moody-bears-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@scaleway/changesets-renovate': patch
---

Do not generate changeset for `package.json` without `version` field
35 changes: 34 additions & 1 deletion packages/changesets-renovate/src/__tests__/generate-changeset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ describe('generate changeset file', () => {
push,
})

fs.readFile = jest.fn().mockResolvedValue(`{"name":"packageName"}`)
fs.readFile = jest
.fn()
.mockResolvedValue(`{"name":"packageName","version":"1.0.0"}`)
fs.writeFile = jest.fn()

await run()
Expand Down Expand Up @@ -146,4 +148,35 @@ describe('generate changeset file', () => {
expect(fs.readFile).toHaveBeenCalledWith(file, 'utf8')
expect(console.log).toHaveBeenCalledWith('No packages modified, skipping')
})

it('should ignore version package.json', async () => {
const file = 'package.json'

// @ts-expect-error we mock at the top
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
simpleGit.mockReturnValue({
branch: () => ({
current: 'renovate/test',
}),
diffSummary: () => ({
files: [
{
file,
},
],
}),
show: () => `
+ "package": "version"
+ "package2": "version2"
`,
})

fs.readFile = jest.fn().mockResolvedValue(`{"name":"packageName"}`)
fs.writeFile = jest.fn()

await run()

expect(fs.readFile).toHaveBeenCalledWith(file, 'utf8')
expect(console.log).toHaveBeenCalledWith('No packages modified, skipping')
})
})
4 changes: 3 additions & 1 deletion packages/changesets-renovate/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ async function getPackagesNames(files: string[]): Promise<string[]> {
const data = JSON.parse(await fs.readFile(file, 'utf8')) as {
name: string
workspaces?: string[]
version?: string
}

if (!data.workspaces) {
// Do not generate changeset for the root package.json of a monorepo
if (!data.workspaces && data.version) {
packages.push(data.name)
}
})
Expand Down