Refactoring

ehmicky · Aug 25, 2019 · f64fa96 · f64fa96
1 parent 8df4d66
commit f64fa96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/options/config.js b/src/options/config.js
@@ -6,11 +6,8 @@ import findUp from 'find-up'
 import { loadYamlFile } from '../utils/yaml.js'
 
 // Retrieve options from the configuration file (if any)
-export const getConfig = async function({
-  opts: { config, ...opts },
-  opts: { cwd = getCwd() },
-}) {
-  const configPath = await getConfigPath(config, cwd)
+export const getConfig = async function({ config, ...opts }) {
+  const configPath = await getConfigPath(config, opts)
 
   if (configPath === undefined) {
     return opts
@@ -20,7 +17,7 @@ export const getConfig = async function({
   return { ...configContent, ...opts }
 }
 
-const getConfigPath = async function(config, cwd) {
+const getConfigPath = async function(config, { cwd = getCwd() }) {
   if (config !== undefined) {
     return resolve(cwd, config)
   }

diff --git a/src/options/main.js b/src/options/main.js
@@ -16,7 +16,7 @@ export const getOpts = async function(action, opts = {}) {
 
   validateOpts(optsA)
 
-  const optsB = await getConfig({ opts: optsA })
+  const optsB = await getConfig(optsA)
   const optsC = addEnvVars(optsB)
 
   validateOpts(optsC)