fix: normalize chunked paths even when maxArgLength is not set

lint-staged · Apr 29, 2020 · d38b283 · d38b283
1 parent defe045
commit d38b283
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/chunkFiles.js b/lib/chunkFiles.js
@@ -33,14 +33,15 @@ function chunkArray(arr, chunkCount) {
  * @returns {Array<Array<String>>}
  */
 module.exports = function chunkFiles({ files, baseDir, maxArgLength = null, relative = false }) {
+  const normalizedFiles = files.map((file) =>
+    normalize(relative || !baseDir ? file : path.resolve(baseDir, file))
+  )
+
   if (!maxArgLength) {
     debug('Skip chunking files because of undefined maxArgLength')
-    return [files]
+    return [normalizedFiles] // wrap in an array to return a single chunk
   }
 
-  const normalizedFiles = files.map((file) =>
-    normalize(relative || !baseDir ? file : path.resolve(baseDir, file))
-  )
   const fileListLength = normalizedFiles.join(' ').length
   debug(
     `Resolved an argument string length of ${fileListLength} characters from ${normalizedFiles.length} files`

diff --git a/test/chunkFiles.spec.js b/test/chunkFiles.spec.js
@@ -1,3 +1,6 @@
+import normalize from 'normalize-path'
+import path from 'path'
+
 import chunkFiles from '../lib/chunkFiles'
 
 describe('chunkFiles', () => {
@@ -26,4 +29,9 @@ describe('chunkFiles', () => {
       [files[2], files[3]],
     ])
   })
+
+  it('should resolve paths when relative: false', () => {
+    const chunkedFiles = chunkFiles({ baseDir, files, relative: false })
+    expect(chunkedFiles).toEqual([files.map((file) => normalize(path.join(baseDir, file)))])
+  })
 })