fix(patch): ignore No newline at end of file

.changeset/blue-carrots-think.md

@@ -0,0 +1,6 @@
+---
+"@pnpm/plugin-commands-patching": patch
+"pnpm": patch
+---
+
+`pnpm patch` should work on files that don't have an end of line [#5320](https://github.com/pnpm/pnpm/issues/5320).

packages/plugin-commands-patching/src/patchCommit.ts

@@ -98,4 +98,5 @@ async function diffFolders (folderA: string, folderB: string) {
     .replace(new RegExp(`(a|b)${escapeStringRegexp(`/${normalizePath(folderBN)}/`)}`, 'g'), '$1/')
     .replace(new RegExp(escapeStringRegexp(`${folderAN}/`), 'g'), '')
     .replace(new RegExp(escapeStringRegexp(`${folderBN}/`), 'g'), '')
+    .replace(/.*No newline at end of file.*$/, '')
 }

packages/plugin-commands-patching/test/patch.test.ts

@@ -94,3 +94,51 @@ describe('patch and commit', () => {
       .rejects.toThrow(`The target directory already exists: '${editDir}'`)
   })
 })
+
+test('patching should work when there is a no EOL in the patched file', async () => {
+  prepare({
+    dependencies: {
+      'safe-execa': '0.1.2',
+    },
+  })
+
+  const cacheDir = path.resolve('cache')
+  const storeDir = path.resolve('store')
+
+  const opts = {
+    cacheDir,
+    dir: process.cwd(),
+    pnpmHomeDir: '',
+    rawConfig: {
+      registry: `http://localhost:${REGISTRY_MOCK_PORT}/`,
+    },
+    registries: { default: `http://localhost:${REGISTRY_MOCK_PORT}/` },
+    storeDir,
+    userConfig: {},
+  }
+
+  const output = await patch.handler(opts, ['safe-execa@0.1.2'])
+  const userPatchDir = output.substring(output.indexOf(':') + 1).trim()
+  const tempDir = os.tmpdir()
+
+  expect(userPatchDir).toContain(tempDir)
+  expect(fs.existsSync(userPatchDir)).toBe(true)
+  expect(fs.existsSync(path.join(userPatchDir, 'lib/index.js'))).toBe(true)
+
+  fs.appendFileSync(path.join(userPatchDir, 'lib/index.js'), '\n// test patching', 'utf8')
+
+  await patchCommit.handler({
+    ...DEFAULT_OPTS,
+    dir: process.cwd(),
+  }, [userPatchDir])
+
+  const { manifest } = await readProjectManifest(process.cwd())
+  expect(manifest.pnpm?.patchedDependencies).toStrictEqual({
+    'safe-execa@0.1.2': 'patches/safe-execa@0.1.2.patch',
+  })
+  const patchContent = fs.readFileSync('patches/safe-execa@0.1.2.patch', 'utf8')
+  expect(patchContent).toContain('diff --git')
+  expect(patchContent).toContain('// test patching')
+  expect(patchContent).not.toContain('No newline at end of file')
+  expect(fs.readFileSync('node_modules/safe-execa/lib/index.js', 'utf8')).toContain('// test patching')
+})