refactor: use object spread

lint-staged · Oct 29, 2018 · 4536ba5 · 4536ba5
1 parent af99172
commit 4536ba5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/getConfig.js b/src/getConfig.js
@@ -121,12 +121,13 @@ const optRmMsg = (opt, helpMsg) => `  Option ${chalk.bold(opt)} was removed.
  */
 function validateConfig(config) {
   debug('Validating config')
-  const exampleConfig = Object.assign({}, defaultConfig, {
+  const exampleConfig = {
+    ...defaultConfig,
     linters: {
       '*.js': ['eslint --fix', 'git add'],
       '*.css': 'stylelint'
     }
-  })
+  }
 
   const deprecatedConfig = {
     gitDir: () => optRmMsg('gitDir', "lint-staged now automatically resolves '.git' directory."),

diff --git a/src/resolveTaskFn.js b/src/resolveTaskFn.js
@@ -29,7 +29,7 @@ function execLinter(bin, args, execaOptions, pathsToLint) {
   debug('args: %O', binArgs)
   debug('opts: %o', execaOptions)
 
-  return execa(bin, binArgs, Object.assign({}, execaOptions))
+  return execa(bin, binArgs, { ...execaOptions })
 }
 
 const successMsg = linter => `${symbols.success} ${linter} passed!`

diff --git a/test/generateTasks.spec.js b/test/generateTasks.spec.js
@@ -89,7 +89,7 @@ describe('generateTasks', () => {
   it('should not match non-children files', () => {
     const relPath = path.join(process.cwd(), '..')
     resolveGitDir.mockReturnValueOnce(relPath)
-    const result = generateTasks(Object.assign({}, config), files)
+    const result = generateTasks({ ...config }, files)
     const linter = result.find(item => item.pattern === '*.js')
     expect(linter).toEqual({
       pattern: '*.js',