[poc] chore(NA): migrate to lodash@4 on oss

package.json

@@ -213,6 +213,8 @@
     "leaflet.heat": "0.2.0",
     "less": "npm:@elastic/[email protected]",
     "less-loader": "5.0.0",
+    "lodash4": "npm:lodash@^4.17.15",
+    "lodash3": "npm:@elastic/[email protected]",
     "lodash": "npm:@elastic/[email protected]",
     "lodash.clonedeep": "^4.5.0",
     "lru-cache": "4.1.5",
@@ -354,6 +356,8 @@
     "@types/json5": "^0.0.30",
     "@types/license-checker": "15.0.0",
     "@types/listr": "^0.14.0",
+    "@types/lodash4": "npm:@types/lodash@^4.14.155",
+    "@types/lodash3": "npm:@types/lodash@^3.10.1",
     "@types/lodash": "^3.10.1",
     "@types/lodash.clonedeep": "^4.5.4",
     "@types/lru-cache": "^5.1.0",

packages/kbn-config-schema/package.json

@@ -14,6 +14,7 @@
     "tsd": "^0.7.4"
   },
   "peerDependencies": {
+    "lodash3": "npm:@elastic/[email protected]",
     "joi": "^13.5.2",
     "moment": "^2.24.0",
     "type-detect": "^4.0.8"

packages/kbn-config-schema/src/internals/index.ts

@@ -27,7 +27,7 @@ import {
   ValidationErrorItem,
   ValidationOptions,
 } from 'joi';
-import { isPlainObject } from 'lodash';
+import { isPlainObject } from 'lodash3';
 import { isDuration } from 'moment';
 import { Stream } from 'stream';
 import { ByteSizeValue, ensureByteSizeValue } from '../byte_size_value';

renovate.json5

@@ -565,6 +565,22 @@
           '@types/lodash.clonedeepwith',
         ],
       },
+      {
+        groupSlug: 'lodash3',
+        groupName: 'lodash3 related packages',
+        packageNames: [
+          'lodash3',
+          '@types/lodash3',
+        ],
+      },
+      {
+        groupSlug: 'lodash4',
+        groupName: 'lodash4 related packages',
+        packageNames: [
+          'lodash4',
+          '@types/lodash4',
+        ],
+      },
       {
         groupSlug: 'log-symbols',
         groupName: 'log-symbols related packages',

src/apm.js

@@ -20,7 +20,7 @@
 const { join } = require('path');
 const { readFileSync } = require('fs');
 const { execSync } = require('child_process');
-const merge = require('lodash.merge');
+const merge = require('lodash4/merge');
 const { name, version, build } = require('../package.json');
 
 const ROOT_DIR = join(__dirname, '..');

src/cli/cli.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 import { pkg } from '../core/server/utils';
 import Command from './command';
 import serveCommand from './serve/serve';

src/cli/cluster/cluster.mock.ts

@@ -20,7 +20,7 @@
 
 // eslint-disable-next-line max-classes-per-file
 import EventEmitter from 'events';
-import { assign, random } from 'lodash';
+import { assign, random } from 'lodash4';
 import { delay } from 'bluebird';
 
 class MockClusterFork extends EventEmitter {

src/cli/cluster/cluster_manager.test.ts

@@ -50,7 +50,7 @@ const mockConfig: any = {
   },
 };
 
-import { sample } from 'lodash';
+import { sample } from 'lodash4';
 
 import { ClusterManager } from './cluster_manager';
 import { Worker } from './worker';
@@ -93,7 +93,7 @@ describe('CLI cluster manager', () => {
     }
 
     const football = {};
-    const messenger = sample(manager.workers);
+    const messenger = sample(manager.workers) as any;
 
     messenger.emit('broadcast', football);
     for (const worker of manager.workers) {

src/cli/cluster/worker.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 import cluster from 'cluster';
 import { EventEmitter } from 'events';
 
@@ -177,7 +177,7 @@ export class Worker extends EventEmitter {
   }
 
   flushChangeBuffer() {
-    const files = _.unique(this.changes.splice(0));
+    const files = _.uniq(this.changes.splice(0));
     const prefix = files.length > 1 ? '\n - ' : '';
     return files.reduce(function (list, file) {
       return `${list || ''}${prefix}"${file}"`;

src/cli/command.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 import Chalk from 'chalk';
 
 import help from './help';

src/cli/help.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 
 export default function help(command, spaces) {
   if (!_.size(command.commands)) {
@@ -72,7 +72,7 @@ function commandsSummary(program) {
   }, 0);
 
   return cmds.reduce(function (help, cmd) {
-    return `${help || ''}${_.padRight(cmd[0], cmdLColWidth)} ${cmd[1] || ''}\n`;
+    return `${help || ''}${_.padEnd(cmd[0], cmdLColWidth)} ${cmd[1] || ''}\n`;
   }, '');
 }
 

src/cli/serve/read_keystore.js

@@ -18,7 +18,7 @@
  */
 
 import path from 'path';
-import { set } from 'lodash';
+import { set } from 'lodash4';
 
 import { Keystore } from '../../legacy/server/keystore';
 import { getDataPath } from '../../core/server/path';

src/cli/serve/serve.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 import { statSync } from 'fs';
 import { resolve } from 'path';
 import url from 'url';

src/cli_keystore/cli_keystore.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 import { join } from 'path';
 
 import { pkg } from '../core/server/utils';

src/cli_plugin/cli.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash';
+import _ from 'lodash4';
 import { pkg } from '../core/server/utils';
 import Command from '../cli/command';
 import listCommand from './list';

src/cli_plugin/install/rename.js

@@ -18,7 +18,7 @@
  */
 
 import { rename } from 'fs';
-import { delay } from 'lodash';
+import { delay } from 'lodash4';
 
 export function renamePlugin(workingPath, finalPath) {
   return new Promise(function (resolve, reject) {

src/cli_plugin/install/zip.js

@@ -20,7 +20,7 @@
 import yauzl from 'yauzl';
 import path from 'path';
 import { createWriteStream, mkdir } from 'fs';
-import { get } from 'lodash';
+import { get } from 'lodash4';
 
 /**
  * Returns an array of package objects. There will be one for each of

src/core/public/chrome/doc_title/doc_title_service.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { compact, flattenDeep, isString } from 'lodash';
+import { compact, flattenDeep, isString } from 'lodash4';
 
 interface StartDeps {
   document: { title: string };

src/core/public/chrome/nav_controls/nav_controls_service.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { sortBy } from 'lodash';
+import { sortBy } from 'lodash4';
 import { BehaviorSubject, ReplaySubject, Observable } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 import { MountPoint } from '../../types';

src/core/public/chrome/nav_links/nav_links_service.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { sortBy } from 'lodash';
+import { sortBy } from 'lodash4';
 import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 

src/core/public/chrome/recently_accessed/persisted_log.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { cloneDeep, isEqual, take } from 'lodash';
+import { cloneDeep, isEqual, take } from 'lodash4';
 import * as Rx from 'rxjs';
 import { map } from 'rxjs/operators';
 

src/core/public/chrome/ui/header/collapsible_nav.tsx

@@ -29,7 +29,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { groupBy, sortBy } from 'lodash';
+import { groupBy, sortBy } from 'lodash4';
 import React, { useRef } from 'react';
 import { useObservable } from 'react-use';
 import * as Rx from 'rxjs';

src/core/public/http/fetch.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { merge } from 'lodash';
+import { merge } from 'lodash3';
 import { format } from 'url';
 import { BehaviorSubject } from 'rxjs';
 
@@ -111,6 +111,7 @@ export class Fetch {
     });
   };
 
+  // TODO: need to migrate this to lodash4
   private createRequest(options: HttpFetchOptionsWithPath): Request {
     // Merge and destructure options out that are not applicable to the Fetch API.
     const {
@@ -134,6 +135,7 @@ export class Fetch {
         },
       }
     );
+
     const url = format({
       pathname: shouldPrependBasePath ? this.params.basePath.prepend(options.path) : options.path,
       query,

src/core/public/injected_metadata/injected_metadata_service.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { get } from 'lodash';
+import { get } from 'lodash4';
 import { DiscoveredPlugin, PluginName } from '../../server';
 import {
   EnvironmentMode,

src/core/public/overlays/banners/priority_map.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { sortBy } from 'lodash';
+import { sortBy } from 'lodash4';
 
 interface PriorityValue {
   readonly priority: number;

src/core/public/plugins/plugin_context.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { omit } from 'lodash';
+import { omit } from 'lodash4';
 import { DiscoveredPlugin } from '../../server';
 import { PluginOpaqueId, PackageInfo, EnvironmentMode } from '../../server/types';
 import { CoreContext } from '../core_system';

src/core/public/plugins/plugins_service.test.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { omit, pick } from 'lodash';
+import { omit, pick } from 'lodash4';
 
 import {
   MockedPluginInitializer,
@@ -92,7 +92,10 @@ describe('PluginsService', () => {
       docLinks: docLinksServiceMock.createSetupContract(),
       fatalErrors: fatalErrorsServiceMock.createSetupContract(),
       http: httpServiceMock.createSetupContract(),
-      injectedMetadata: pick(injectedMetadataServiceMock.createStartContract(), 'getInjectedVar'),
+      injectedMetadata: pick(
+        injectedMetadataServiceMock.createStartContract(),
+        'getInjectedVar'
+      ) as any,
       notifications: notificationServiceMock.createSetupContract(),
       uiSettings: uiSettingsServiceMock.createSetupContract(),
     };
@@ -107,7 +110,10 @@ describe('PluginsService', () => {
       http: httpServiceMock.createStartContract(),
       chrome: chromeServiceMock.createStartContract(),
       i18n: i18nServiceMock.createStartContract(),
-      injectedMetadata: pick(injectedMetadataServiceMock.createStartContract(), 'getInjectedVar'),
+      injectedMetadata: pick(
+        injectedMetadataServiceMock.createStartContract(),
+        'getInjectedVar'
+      ) as any,
       notifications: notificationServiceMock.createStartContract(),
       overlays: overlayServiceMock.createStartContract(),
       uiSettings: uiSettingsServiceMock.createStartContract(),

src/core/public/saved_objects/saved_objects_client.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { cloneDeep, pick, throttle } from 'lodash';
+import { cloneDeep, pick, throttle } from 'lodash4';
 import { resolve as resolveUrl } from 'url';
 
 import {
@@ -162,7 +162,9 @@ export class SavedObjectsClient {
             });
 
             if (!foundObject) {
-              return queueItem.resolve(this.createSavedObject(pick(queueItem, ['id', 'type'])));
+              return queueItem.resolve(
+                this.createSavedObject(pick(queueItem, ['id', 'type']) as SavedObject)
+              );
             }
 
             queueItem.resolve(foundObject);

src/core/public/saved_objects/simple_saved_object.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { get, has, set } from 'lodash';
+import { get, has, set } from 'lodash4';
 import { SavedObject as SavedObjectType } from '../../server';
 import { SavedObjectsClientContract } from './saved_objects_client';
 
@@ -60,7 +60,7 @@ export class SimpleSavedObject<T = unknown> {
   }
 
   public set(key: string, value: any): T {
-    return set(this.attributes, key, value);
+    return set(this.attributes as any, key, value) as any;
   }
 
   public has(key: string): boolean {

src/core/public/ui_settings/ui_settings_client.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { cloneDeep, defaultsDeep } from 'lodash';
+import { cloneDeep, defaultsDeep } from 'lodash4';
 import { Observable, Subject, concat, defer, of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 

src/core/server/capabilities/merge_capabilities.ts

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { merge } from 'lodash';
+import { mergeWith } from 'lodash4';
 import { Capabilities } from './types';
 
 export const mergeCapabilities = (...sources: Array<Partial<Capabilities>>): Capabilities =>
-  merge({}, ...sources, (a: any, b: any) => {
+  mergeWith({}, ...sources, (a: any, b: any) => {
     if (
       (typeof a === 'boolean' && typeof b === 'object') ||
       (typeof a === 'object' && typeof b === 'boolean')