From dbb03471b406fa287c97aeeade56179a38ca31be Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <z@kochan.io>
Date: Fri, 4 Oct 2019 01:47:14 +0300
Subject: [PATCH] refactor: localConfig=>rawLocalConfig

---
 packages/config/src/Config.ts            | 2 +-
 packages/config/src/index.ts             | 6 +++---
 packages/config/test/index.ts            | 8 ++++----
 packages/pnpm/src/cmd/install.ts         | 6 +++---
 packages/pnpm/src/cmd/recursive/index.ts | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/config/src/Config.ts b/packages/config/src/Config.ts
index 6d4f55e29e..05c59d7bc2 100644
--- a/packages/config/src/Config.ts
+++ b/packages/config/src/Config.ts
@@ -7,7 +7,7 @@ export interface Config {
   useBetaCli: boolean,
   extraBinPaths: string[],
   filter: string[],
-  localConfig: Record<string, any>, // tslint:disable-line
+  rawLocalConfig: Record<string, any>, // tslint:disable-line
   rawConfig: Record<string, any>, // tslint:disable-line
   globalPrefix: string,
   globalBin: string,
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
index d8ad3037a1..db2f90e5a6 100644
--- a/packages/config/src/index.ts
+++ b/packages/config/src/index.ts
@@ -181,13 +181,13 @@ export default async (
         : npmConfig.get(configKey)
       return acc
     }, {} as Config)
-  pnpmConfig.localConfig = Object.assign.apply(Object, [
+  pnpmConfig.rawLocalConfig = Object.assign.apply(Object, [
     {},
     ...npmConfig.list.slice(3, pnpmConfig.workspacePrefix && pnpmConfig.workspacePrefix !== pnpmConfig.localPrefix ? 5 : 4),
     cliArgs,
   ] as any) // tslint:disable-line:no-any
-  pnpmConfig.userAgent = pnpmConfig.localConfig['user-agent']
-    ? pnpmConfig.localConfig['user-agent']
+  pnpmConfig.userAgent = pnpmConfig.rawLocalConfig['user-agent']
+    ? pnpmConfig.rawLocalConfig['user-agent']
     : `${packageManager.name}/${packageManager.version} npm/? node/${process.version} ${process.platform} ${process.arch}`
   pnpmConfig.rawConfig = Object.assign.apply(Object, [
     { registry: 'https://registry.npmjs.org/' },
diff --git a/packages/config/test/index.ts b/packages/config/test/index.ts
index 0babb8db7d..570b165cf6 100644
--- a/packages/config/test/index.ts
+++ b/packages/config/test/index.ts
@@ -629,7 +629,7 @@ test('do not throw error if --independent-leaves is used with --no-hoist', async
   t.end()
 })
 
-test('localConfig in a workspace', async (t) => {
+test('rawLocalConfig in a workspace', async (t) => {
   const tmp = tempy.directory()
   t.comment(`temp dir created: ${tmp}`)
 
@@ -650,7 +650,7 @@ test('localConfig in a workspace', async (t) => {
     },
   })
 
-  t.deepEqual(config.localConfig, {
+  t.deepEqual(config.rawLocalConfig, {
     'hoist-pattern': 'eslint-*',
     'independent-leaves': true,
     'save-exact': true,
@@ -658,7 +658,7 @@ test('localConfig in a workspace', async (t) => {
   t.end()
 })
 
-test('localConfig', async (t) => {
+test('rawLocalConfig', async (t) => {
   const tmp = tempy.directory()
   t.comment(`temp dir created: ${tmp}`)
 
@@ -675,7 +675,7 @@ test('localConfig', async (t) => {
     },
   })
 
-  t.deepEqual(config.localConfig, {
+  t.deepEqual(config.rawLocalConfig, {
     'independent-leaves': true,
     'save-exact': true,
   })
diff --git a/packages/pnpm/src/cmd/install.ts b/packages/pnpm/src/cmd/install.ts
index bdb9ceb1bd..43bba29570 100644
--- a/packages/pnpm/src/cmd/install.ts
+++ b/packages/pnpm/src/cmd/install.ts
@@ -58,9 +58,9 @@ export default async function installCmd (
     store: store.path,
     storeController: store.ctrl,
 
-    forceHoistPattern: typeof opts.localConfig['hoist-pattern'] !== 'undefined' || typeof opts.localConfig['hoist'] !== 'undefined',
-    forceIndependentLeaves: typeof opts.localConfig['independent-leaves'] !== 'undefined',
-    forceShamefullyHoist: typeof opts.localConfig['shamefully-hoist'] !== 'undefined',
+    forceHoistPattern: typeof opts.rawLocalConfig['hoist-pattern'] !== 'undefined' || typeof opts.rawLocalConfig['hoist'] !== 'undefined',
+    forceIndependentLeaves: typeof opts.rawLocalConfig['independent-leaves'] !== 'undefined',
+    forceShamefullyHoist: typeof opts.rawLocalConfig['shamefully-hoist'] !== 'undefined',
   }
 
   let { manifest, writeImporterManifest } = await tryReadImporterManifest(opts.prefix, opts)
diff --git a/packages/pnpm/src/cmd/recursive/index.ts b/packages/pnpm/src/cmd/recursive/index.ts
index fbcf15cb17..aa2c2c4065 100644
--- a/packages/pnpm/src/cmd/recursive/index.ts
+++ b/packages/pnpm/src/cmd/recursive/index.ts
@@ -199,9 +199,9 @@ export async function recursive (
     storeController,
     targetDependenciesField: getSaveType(opts),
 
-    forceHoistPattern: typeof opts.localConfig['hoist-pattern'] !== 'undefined' || typeof opts.localConfig['hoist'] !== 'undefined',
-    forceIndependentLeaves: typeof opts.localConfig['independent-leaves'] !== 'undefined',
-    forceShamefullyHoist: typeof opts.localConfig['shamefully-hoist'] !== 'undefined',
+    forceHoistPattern: typeof opts.rawLocalConfig['hoist-pattern'] !== 'undefined' || typeof opts.rawLocalConfig['hoist'] !== 'undefined',
+    forceIndependentLeaves: typeof opts.rawLocalConfig['independent-leaves'] !== 'undefined',
+    forceShamefullyHoist: typeof opts.rawLocalConfig['shamefully-hoist'] !== 'undefined',
   }) as InstallOptions
 
   const result = {