diff --git a/lib/workers/branch/lock-files.js b/lib/workers/branch/lock-files.js index af518832ab265fb4863ba62869565a6d56f27640..485e6d61ebd6d88d72344975ba15077b3ef9a2b3 100644 --- a/lib/workers/branch/lock-files.js +++ b/lib/workers/branch/lock-files.js @@ -102,8 +102,8 @@ async function writeExistingFiles(config) { logger.debug(`Writing package.json to ${basedir}`); // Massage the file to eliminate yarn errors const massagedFile = { ...packageFile.content }; - if (massagedFile.name && !massagedFile.name.match(/^[0-9a-z-_]+$/)) { - massagedFile.name = 'dummy'; + if (massagedFile.name) { + massagedFile.name = massagedFile.name.replace(/[{}\s]/g, ''); } delete massagedFile.engines; delete massagedFile.scripts; @@ -142,8 +142,8 @@ async function writeUpdatedPackageFiles(config) { } logger.debug(`Writing ${packageFile.name}`); const massagedFile = JSON.parse(packageFile.contents); - if (massagedFile.name && !massagedFile.name.match(/^[0-9a-z-_]+$/)) { - massagedFile.name = 'dummy'; + if (massagedFile.name) { + massagedFile.name = massagedFile.name.replace(/[{}\s]/g, ''); } delete massagedFile.engines; delete massagedFile.scripts; diff --git a/test/workers/branch/__snapshots__/lock-files.spec.js.snap b/test/workers/branch/__snapshots__/lock-files.spec.js.snap index a732a11b45656f03f23dce1a29882b780d47e45b..d0f104b7981d7ea9397f459407c59dd364d5d0bd 100644 --- a/test/workers/branch/__snapshots__/lock-files.spec.js.snap +++ b/test/workers/branch/__snapshots__/lock-files.spec.js.snap @@ -86,7 +86,7 @@ exports[`workers/branch/lock-files writeExistingFiles writes files and removes f Array [ Array [ "some-tmp-dir/package.json", - "{\\"name\\":\\"dummy\\"}", + "{\\"name\\":\\"package1\\"}", ], Array [ "some-tmp-dir/.npmrc", @@ -107,7 +107,7 @@ exports[`workers/branch/lock-files writeUpdatedPackageFiles writes updated packa Array [ Array [ "some-tmp-dir/package.json", - "{\\"name\\":\\"dummy\\"}", + "{\\"name\\":\\"some-template\\"}", ], Array [ "some-tmp-dir/backend/package.json", diff --git a/test/workers/branch/lock-files.spec.js b/test/workers/branch/lock-files.spec.js index 0281c6c54bc3a9c4d3ed0256a443c0333eae22fe..09d13dac04cfd92e633b82384a7e67d9dfc78cfd 100644 --- a/test/workers/branch/lock-files.spec.js +++ b/test/workers/branch/lock-files.spec.js @@ -251,7 +251,9 @@ describe('workers/branch/lock-files', () => { await writeUpdatedPackageFiles(config); expect(fs.outputFile.mock.calls).toMatchSnapshot(); expect(fs.outputFile.mock.calls).toHaveLength(2); - expect(fs.outputFile.mock.calls[0][1].includes('"dummy"')).toBe(true); + expect(fs.outputFile.mock.calls[0][1].includes('"some-template"')).toBe( + true + ); expect(fs.outputFile.mock.calls[1][1].includes('"engines"')).toBe(false); }); });