refactor: do not use require (#272)

stoplightio · May 8, 2019 · a17c19d · a17c19d
1 parent 3b6b508
commit a17c19d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/packages/core/src/loaders/http/httpLoader.ts b/packages/core/src/loaders/http/httpLoader.ts
@@ -1,7 +1,7 @@
 import { FilesystemNodeType } from '@stoplight/graphite/backends/filesystem';
 import { IHttpOperation } from '@stoplight/types';
 import axios from 'axios';
-import trimStart = require('lodash/trimStart');
+import { trimStart } from 'lodash';
 import { extname } from 'path';
 import { IHttpLoaderOpts } from '../../types';
 import { GraphFacade } from '../../utils/graphFacade';

diff --git a/packages/core/src/utils/configMergerFactory.ts b/packages/core/src/utils/configMergerFactory.ts
@@ -1,8 +1,6 @@
+import { compact, merge } from 'lodash';
 import { PartialPrismConfig, PrismConfig, PrismConfigFactory, resolveConfig } from '..';
 
-const _compact = require('lodash/compact');
-const _merge = require('lodash/merge');
-
 /**
  * Merges all passed configs. Each next config wil override each previous config.
  */
@@ -14,18 +12,18 @@ export function configMergerFactory<C, I>(
   return (input: I, defaultConfig?: PartialPrismConfig<C, I>): C => {
     const resolvedConfigs =
       // remove any falsy resolved configs
-      _compact(
+      compact(
         // remove falsy config props
-        _compact([baseConfig, ...configs])
+        compact([baseConfig, ...configs])
           // resolve each config (resolveConfig is async)
-          .map((c: C) => resolveConfig(input, c, defaultConfig)),
+          .map(c => resolveConfig(input, c, defaultConfig)),
       );
 
     if (!resolvedConfigs.length) {
       throw new Error('All configurations passed to the factory are undefined.');
     }
 
     // merge the configs over each other, in order
-    return _merge({}, ...resolvedConfigs);
+    return merge({}, ...resolvedConfigs);
   };
 }
diff --git a/packages/core/src/utils/graphFacade.ts b/packages/core/src/utils/graphFacade.ts
@@ -16,7 +16,7 @@ import { IHttpOperation } from '@stoplight/types';
 import * as fs from 'fs';
 import { extname, resolve } from 'path';
 
-import compact = require('lodash/compact');
+import { compact } from 'lodash';
 
 export class GraphFacade {
   private fsBackend: FileSystemBackend;

diff --git a/packages/http/src/mocker/generator/JSONSchemaExampleGenerator.ts b/packages/http/src/mocker/generator/JSONSchemaExampleGenerator.ts
@@ -1,6 +1,6 @@
 // @ts-ignore
 import * as jsf from 'json-schema-faker';
-import cloneDeep = require('lodash/cloneDeep');
+import { cloneDeep } from 'lodash';
 import { IExampleGenerator } from './IExampleGenerator';
 
 jsf.option({

diff --git a/packages/http/src/router/__tests__/utils.ts b/packages/http/src/router/__tests__/utils.ts
@@ -1,6 +1,6 @@
 import { IHttpMethod } from '@stoplight/prism-http';
 import { Chance } from 'chance';
-import defaults = require('lodash/defaults');
+import { defaults } from 'lodash';
 
 const chance = new Chance();
 const httpMethods: IHttpMethod[] = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'];