[poc] chore(NA): upgrade to lodash@4

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldformat.tojson.md

@@ -12,14 +12,14 @@ Serialize this format to a simple POJO, with only the params that are not defaul
 
 ```typescript
 toJSON(): {
-        id: unknown;
-        params: _.Dictionary<unknown> | undefined;
+        id: any;
+        params: any;
     };
 ```
 <b>Returns:</b>
 
 `{
-        id: unknown;
-        params: _.Dictionary<unknown> | undefined;
+        id: any;
+        params: any;
     }`
 

package.json

@@ -88,7 +88,6 @@
     "**/@types/hoist-non-react-statics": "^3.3.1",
     "**/@types/chai": "^4.2.11",
     "**/typescript": "3.9.5",
-    "**/graphql-toolkit/lodash": "^4.17.13",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
     "**/image-diff/gm/debug": "^2.6.9",
@@ -213,8 +212,7 @@
     "leaflet.heat": "0.2.0",
     "less": "npm:@elastic/[email protected]",
     "less-loader": "5.0.0",
-    "lodash": "npm:@elastic/[email protected]",
-    "lodash.clonedeep": "^4.5.0",
+    "lodash": "^4.17.15",
     "lru-cache": "4.1.5",
     "markdown-it": "^10.0.0",
     "mini-css-extract-plugin": "0.8.0",
@@ -354,8 +352,7 @@
     "@types/json5": "^0.0.30",
     "@types/license-checker": "15.0.0",
     "@types/listr": "^0.14.0",
-    "@types/lodash": "^3.10.1",
-    "@types/lodash.clonedeep": "^4.5.4",
+    "@types/lodash": "^4.14.155",
     "@types/lru-cache": "^5.1.0",
     "@types/markdown-it": "^0.0.7",
     "@types/minimatch": "^2.0.29",

packages/kbn-interpreter/package.json

@@ -11,8 +11,7 @@
   "dependencies": {
     "@babel/runtime": "^7.10.2",
     "@kbn/i18n": "1.0.0",
-    "lodash": "npm:@elastic/[email protected]",
-    "lodash.clone": "^4.5.0",
+    "lodash": "^4.17.15",
     "uuid": "3.3.2"
   },
   "devDependencies": {

packages/kbn-interpreter/src/common/lib/registry.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import clone from 'lodash.clone';
+import { clone } from 'lodash';
 
 export class Registry {
   constructor(prop = 'name') {

packages/kbn-plugin-generator/index.js

@@ -23,7 +23,7 @@ const dedent = require('dedent');
 const sao = require('sao');
 const chalk = require('chalk');
 const getopts = require('getopts');
-const snakeCase = require('lodash.snakecase');
+const { snakeCase } = require('lodash');
 
 exports.run = function run(argv) {
   const options = getopts(argv, {
@@ -41,7 +41,7 @@ exports.run = function run(argv) {
   if (options.help) {
     console.log(
       dedent(chalk`
-        # {dim Usage:} 
+        # {dim Usage:}
         node scripts/generate-plugin {bold [name]}
         Generate a fresh Kibana plugin in the plugins/ directory
       `) + '\n'

packages/kbn-plugin-generator/package.json

@@ -8,10 +8,7 @@
     "dedent": "^0.7.0",
     "execa": "^4.0.2",
     "getopts": "^2.2.4",
-    "lodash.camelcase": "^4.3.0",
-    "lodash.kebabcase": "^4.1.1",
-    "lodash.snakecase": "^4.1.1",
-    "lodash.startcase": "^4.4.0",
+    "lodash": "^4.17.15",
     "sao": "^0.22.12"
   }
 }

packages/kbn-plugin-generator/sao_template/sao.js

@@ -20,9 +20,7 @@
 const { relative, resolve } = require('path');
 const fs = require('fs');
 
-const startCase = require('lodash.startcase');
-const camelCase = require('lodash.camelcase');
-const snakeCase = require('lodash.snakecase');
+const { camelCase, startCase, snakeCase } = require('lodash');
 const chalk = require('chalk');
 const execa = require('execa');
 

packages/kbn-pm/package.json

@@ -22,7 +22,7 @@
     "@types/glob": "^5.0.35",
     "@types/globby": "^6.1.0",
     "@types/has-ansi": "^3.0.0",
-    "@types/lodash.clonedeepwith": "^4.5.3",
+    "@types/lodash": "^4.14.155",
     "@types/log-symbols": "^2.0.0",
     "@types/ncp": "^2.0.1",
     "@types/node": ">=10.17.17 <10.20.0",
@@ -46,7 +46,7 @@
     "globby": "^8.0.1",
     "has-ansi": "^3.0.0",
     "is-path-inside": "^3.0.2",
-    "lodash.clonedeepwith": "^4.5.0",
+    "lodash": "^4.17.15",
     "log-symbols": "^2.2.0",
     "multimatch": "^4.0.0",
     "ncp": "^2.0.0",

packages/kbn-pm/src/test_helpers/absolute_path_snapshot_serializer.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import cloneDeepWith from 'lodash.clonedeepwith';
+import { cloneDeepWith } from 'lodash';
 import { resolve, sep as pathSep } from 'path';
 
 const repoRoot = resolve(__dirname, '../../../../');

packages/kbn-storybook/lib/webpack.dll.config.js

@@ -54,7 +54,6 @@ module.exports = {
     'highlight.js',
     'html-entities',
     'jquery',
-    'lodash.clone',
     'lodash',
     'markdown-it',
     'mocha',

packages/kbn-test/src/functional_test_runner/lib/config/config.ts

@@ -18,10 +18,7 @@
  */
 
 import { Schema } from 'joi';
-import { cloneDeep, get, has } from 'lodash';
-
-// @ts-ignore internal lodash module is not typed
-import toPath from 'lodash/internal/toPath';
+import { cloneDeepWith, get, has, toPath } from 'lodash';
 
 import { schema } from './schema';
 
@@ -114,15 +111,15 @@ export class Config {
       throw new Error(`Unknown config key "${key}"`);
     }
 
-    return cloneDeep(get(this[$values], key, defaultValue), (v) => {
+    return cloneDeepWith(get(this[$values], key, defaultValue), (v) => {
       if (typeof v === 'function') {
         return v;
       }
     });
   }
 
   public getAll() {
-    return cloneDeep(this[$values], (v) => {
+    return cloneDeepWith(this[$values], (v) => {
       if (typeof v === 'function') {
         return v;
       }

packages/kbn-test/src/legacy_es/legacy_es_test_cluster.js

@@ -19,8 +19,7 @@
 
 import { resolve } from 'path';
 import { format } from 'url';
-import { get } from 'lodash';
-import toPath from 'lodash/internal/toPath';
+import { get, toPath } from 'lodash';
 import { Cluster } from '@kbn/es';
 import { CI_PARALLEL_PROCESS_PREFIX } from '../ci_parallel_process_prefix';
 import { esTestConfig } from './es_test_config';

packages/kbn-test/src/page_load_metrics/navigation.ts

@@ -19,7 +19,6 @@
 
 import Fs from 'fs';
 import Url from 'url';
-import _ from 'lodash';
 import puppeteer from 'puppeteer';
 import { resolve } from 'path';
 import { ToolingLog } from '@kbn/dev-utils';

packages/kbn-ui-framework/Gruntfile.js

@@ -21,7 +21,7 @@ const sass = require('node-sass');
 const postcss = require('postcss');
 const postcssConfig = require('../../src/optimize/postcss.config');
 const chokidar = require('chokidar');
-const debounce = require('lodash/function/debounce');
+const debounce = require('lodash/debounce');
 
 const platform = require('os').platform();
 const isPlatformWindows = /^win/.test(platform);

packages/kbn-ui-framework/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "classnames": "2.2.6",
     "focus-trap-react": "^3.1.1",
-    "lodash": "npm:@elastic/[email protected]",
+    "lodash": "^4.17.15",
     "prop-types": "15.6.0",
     "react": "^16.12.0",
     "react-ace": "^5.9.0",

renovate.json5

@@ -549,22 +549,6 @@
           '@types/lodash',
         ],
       },
-      {
-        groupSlug: 'lodash.clonedeep',
-        groupName: 'lodash.clonedeep related packages',
-        packageNames: [
-          'lodash.clonedeep',
-          '@types/lodash.clonedeep',
-        ],
-      },
-      {
-        groupSlug: 'lodash.clonedeepwith',
-        groupName: 'lodash.clonedeepwith related packages',
-        packageNames: [
-          'lodash.clonedeepwith',
-          '@types/lodash.clonedeepwith',
-        ],
-      },
       {
         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('lodash/merge');
 const { name, version, build } = require('../package.json');
 
 const ROOT_DIR = join(__dirname, '..');

src/cli/cluster/cluster_manager.test.ts

@@ -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

@@ -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/help.js

@@ -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/core/public/http/fetch.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { merge } from 'lodash';
+import { merge, omitBy, isNil } from 'lodash';
 import { format } from 'url';
 import { BehaviorSubject } from 'rxjs';
 
@@ -112,6 +112,10 @@ export class Fetch {
   };
 
   private createRequest(options: HttpFetchOptionsWithPath): Request {
+    const filteredOptions = {
+      ...options,
+      query: omitBy(options.query, isNil),
+    };
     // Merge and destructure options out that are not applicable to the Fetch API.
     const {
       query,
@@ -125,15 +129,16 @@ export class Fetch {
         credentials: 'same-origin',
         prependBasePath: true,
       },
-      options,
+      filteredOptions,
       {
         headers: {
           'Content-Type': 'application/json',
-          ...options.headers,
+          ...filteredOptions.headers,
           'kbn-version': this.params.kibanaVersion,
         },
       }
     );
+
     const url = format({
       pathname: shouldPrependBasePath ? this.params.basePath.prepend(options.path) : options.path,
       query,

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

@@ -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

@@ -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

@@ -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/server/capabilities/merge_capabilities.ts

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { merge } from 'lodash';
+import { mergeWith } from 'lodash';
 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')

src/core/server/config/deprecation/core_deprecations.ts

@@ -41,7 +41,7 @@ const dataPathDeprecation: ConfigDeprecation = (settings, fromPath, log) => {
 const xsrfDeprecation: ConfigDeprecation = (settings, fromPath, log) => {
   if (
     has(settings, 'server.xsrf.whitelist') &&
-    get<unknown[]>(settings, 'server.xsrf.whitelist').length > 0
+    get<unknown[]>(settings, 'server.xsrf.whitelist' as any).length > 0
   ) {
     log(
       'It is not recommended to disable xsrf protections for API endpoints via [server.xsrf.whitelist]. ' +

src/core/server/elasticsearch/errors.ts

@@ -81,7 +81,7 @@ export class ElasticsearchErrorHelpers {
 
   public static decorateNotAuthorizedError(error: Error, reason?: string) {
     const decoratedError = decorate(error, ErrorCode.NOT_AUTHORIZED, 401, reason);
-    const wwwAuthHeader = get<string>(error, 'body.error.header[WWW-Authenticate]');
+    const wwwAuthHeader = get<string>(error as any, 'body.error.header[WWW-Authenticate]' as any);
 
     decoratedError.output.headers['WWW-Authenticate'] =
       wwwAuthHeader || 'Basic realm="Authorization Required"';

src/core/server/http/base_path_proxy_server.ts

@@ -24,7 +24,7 @@ import apm from 'elastic-apm-node';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { Server, Request, ResponseToolkit } from 'hapi';
 import HapiProxy from 'h2o2';
-import { sample } from 'lodash';
+import { sampleSize } from 'lodash';
 import BrowserslistUserAgent from 'browserslist-useragent';
 import * as Rx from 'rxjs';
 import { take } from 'rxjs/operators';
@@ -90,7 +90,7 @@ export class BasePathProxyServer {
     httpConfig.maxPayload = new ByteSizeValue(ONE_GIGABYTE);
 
     if (!httpConfig.basePath) {
-      httpConfig.basePath = `/${sample(alphabet, 3).join('')}`;
+      httpConfig.basePath = `/${sampleSize(alphabet, 3).join('')}`;
     }
   }