Move logic

ehmicky · Feb 27, 2022 · 2991626 · 2991626
1 parent d23053a
commit 2991626
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/config/load/main.js b/src/config/load/main.js
@@ -1,6 +1,6 @@
 import { removeEmptyValues } from '../empty.js'
 import { deepMerge } from '../merge.js'
-import { CLI_FLAGS_BASE, getDefaultBase } from '../normalize/cwd.js'
+import { CLI_FLAGS_BASE, getDefaultBase, getPropCwd } from '../normalize/cwd.js'
 
 import { getConfigInfos } from './info.js'
 import { addNpxShortcut } from './npx.js'
@@ -21,7 +21,8 @@ export const loadConfig = async function (configFlags) {
   const configA = removeEmptyValues(config)
   const bases = deepMerge(configInfos.map(getBases))
   const defaultBase = getDefaultBase(configInfos)
-  return { config: configA, bases, defaultBase }
+  const cwd = getPropCwd.bind(undefined, { bases, defaultBase })
+  return { config: configA, cwd }
 }
 
 const getConfigContents = function ({ configContents }) {

diff --git a/src/config/main.js b/src/config/main.js
@@ -1,14 +1,12 @@
 import { loadConfig } from './load/main.js'
-import { getPropCwd } from './normalize/cwd.js'
 import { normalizeConfig } from './normalize/main.js'
 import { RULES } from './normalize/rules.js'
 import { normalizePluginsConfig } from './plugin/main.js'
 
 // Retrieve configuration
 export const getConfig = async function (command, configFlags = {}) {
-  const { config, bases, defaultBase } = await loadConfig(configFlags)
+  const { config, cwd } = await loadConfig(configFlags)
   const context = { command }
-  const cwd = getPropCwd.bind(undefined, { bases, defaultBase })
   const configA = await normalizeConfig(config, RULES, { context, cwd })
   const configB = await normalizePluginsConfig({
     config: configA,