diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index 71caff8414902..35fc25f6ce189 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -1,12 +1,12 @@ import cluster from 'cluster'; -const { join } = require('path'); -const { format: formatUrl } = require('url'); import Hapi from 'hapi'; -const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodash'); import Log from '../Log'; import Worker from './worker'; import BasePathProxy from './base_path_proxy'; +import { join } from 'path'; +import { format as formatUrl } from 'url'; +import { debounce, compact, get, invoke, bindAll, once, sample } from 'lodash'; process.env.kbnWorkerType = 'managr'; diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js index c8bbcada4579d..9a849d246e2cb 100644 --- a/src/cli/cluster/worker.js +++ b/src/cli/cluster/worker.js @@ -1,9 +1,9 @@ import _ from 'lodash'; import cluster from 'cluster'; -let { resolve } = require('path'); -let { EventEmitter } = require('events'); import fromRoot from '../../utils/fromRoot'; +import { resolve } from 'path'; +import { EventEmitter } from 'events'; let cliPath = fromRoot('src/cli'); let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']); diff --git a/src/cli/plugin/__tests__/plugin_downloader.js b/src/cli/plugin/__tests__/plugin_downloader.js index daabe2d4f173e..f0e9fd6df0e51 100644 --- a/src/cli/plugin/__tests__/plugin_downloader.js +++ b/src/cli/plugin/__tests__/plugin_downloader.js @@ -3,10 +3,10 @@ import sinon from 'sinon'; import nock from 'nock'; import glob from 'glob'; import rimraf from 'rimraf'; -const { join } = require('path'); import mkdirp from 'mkdirp'; import pluginLogger from '../plugin_logger'; import pluginDownloader from '../plugin_downloader'; +import { join } from 'path'; describe('kibana cli', function () { diff --git a/src/cli/plugin/__tests__/plugin_extractor.js b/src/cli/plugin/__tests__/plugin_extractor.js index a711754c2fb04..2437c6adf335c 100644 --- a/src/cli/plugin/__tests__/plugin_extractor.js +++ b/src/cli/plugin/__tests__/plugin_extractor.js @@ -2,12 +2,12 @@ import expect from 'expect.js'; import sinon from 'sinon'; import glob from 'glob'; import rimraf from 'rimraf'; -const { join } = require('path'); import mkdirp from 'mkdirp'; import pluginLogger from '../plugin_logger'; import extract from '../plugin_extractor'; import pluginDownloader from '../plugin_downloader'; +import { join } from 'path'; describe('kibana cli', function () { diff --git a/src/cli/plugin/__tests__/plugin_installer.js b/src/cli/plugin/__tests__/plugin_installer.js index 1642781ffd0ed..a8988052fdf48 100644 --- a/src/cli/plugin/__tests__/plugin_installer.js +++ b/src/cli/plugin/__tests__/plugin_installer.js @@ -1,10 +1,10 @@ import expect from 'expect.js'; import sinon from 'sinon'; import rimraf from 'rimraf'; -const { mkdirSync } = require('fs'); -const { join } = require('path'); import pluginLogger from '../plugin_logger'; import pluginInstaller from '../plugin_installer'; +import { mkdirSync } from 'fs'; +import { join } from 'path'; describe('kibana cli', function () { diff --git a/src/cli/plugin/downloaders/file.js b/src/cli/plugin/downloaders/file.js index b04a469f7e946..14b802d8adc7c 100644 --- a/src/cli/plugin/downloaders/file.js +++ b/src/cli/plugin/downloaders/file.js @@ -1,5 +1,5 @@ -const { createWriteStream, createReadStream, unlinkSync, statSync } = require('fs'); import getProgressReporter from '../progress_reporter'; +import { createWriteStream, createReadStream, unlinkSync, statSync } from 'fs'; function openSourceFile({ sourcePath }) { try { diff --git a/src/cli/plugin/downloaders/http.js b/src/cli/plugin/downloaders/http.js index 43199f7ef69fb..d03236052286b 100644 --- a/src/cli/plugin/downloaders/http.js +++ b/src/cli/plugin/downloaders/http.js @@ -1,7 +1,7 @@ -const { fromNode: fn } = require('bluebird'); -const { createWriteStream, unlinkSync } = require('fs'); import Wreck from 'wreck'; import getProgressReporter from '../progress_reporter'; +import { fromNode as fn } from 'bluebird'; +import { createWriteStream, unlinkSync } from 'fs'; function sendRequest({ sourceUrl, timeout }) { const maxRedirects = 11; //Because this one goes to 11. diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js index c5e30378860cc..80428708ebcf9 100644 --- a/src/cli/plugin/plugin_installer.js +++ b/src/cli/plugin/plugin_installer.js @@ -6,8 +6,8 @@ import pluginCleaner from './plugin_cleaner'; import pluginExtractor from './plugin_extractor'; import KbnServer from '../../server/KbnServer'; import readYamlConfig from '../serve/read_yaml_config'; -const { statSync, renameSync } = require('fs'); import Promise from 'bluebird'; +import { statSync, renameSync } from 'fs'; const rimrafSync = require('rimraf').sync; const mkdirp = Promise.promisify(require('mkdirp')); diff --git a/src/cli/plugin/setting_parser.js b/src/cli/plugin/setting_parser.js index 58eb393ba7af4..0e581b22b11a4 100644 --- a/src/cli/plugin/setting_parser.js +++ b/src/cli/plugin/setting_parser.js @@ -1,6 +1,6 @@ -const { resolve } = require('path'); import expiry from 'expiry-js'; import { intersection } from 'lodash'; +import { resolve } from 'path'; export default function createSettingParser(options) { function parseMilliseconds(val) { diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index 46eb2428a2f37..698d907dc2a24 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -const { isWorker } = require('cluster'); -const { resolve } = require('path'); +import { isWorker } from 'cluster'; +import { resolve } from 'path'; const cwd = process.cwd(); const src = require('requirefrom')('src'); diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js index 9145f490e7557..dd7aba90e2089 100644 --- a/src/optimize/BaseOptimizer.js +++ b/src/optimize/BaseOptimizer.js @@ -1,7 +1,3 @@ -let { inherits } = require('util'); -let { defaults } = require('lodash'); -let { resolve } = require('path'); -let { writeFile } = require('fs'); import webpack from 'webpack'; import Boom from 'boom'; import DirectoryNameAsMain from 'webpack-directory-name-as-main'; @@ -11,6 +7,10 @@ import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin'; let utils = require('requirefrom')('src/utils'); let fromRoot = utils('fromRoot'); import babelOptions from './babelOptions'; +import { inherits } from 'util'; +import { defaults } from 'lodash'; +import { resolve } from 'path'; +import { writeFile } from 'fs'; let babelExclude = [/[\/\\](webpackShims|node_modules|bower_components)[\/\\]/]; class BaseOptimizer { diff --git a/src/optimize/FsOptimizer.js b/src/optimize/FsOptimizer.js index c25df7bb6c97e..178385838b8b4 100644 --- a/src/optimize/FsOptimizer.js +++ b/src/optimize/FsOptimizer.js @@ -1,8 +1,8 @@ -let { fromNode } = require('bluebird'); -let { writeFile } = require('fs'); import BaseOptimizer from './BaseOptimizer'; import fromRoot from '../utils/fromRoot'; +import { fromNode } from 'bluebird'; +import { writeFile } from 'fs'; module.exports = class FsOptimizer extends BaseOptimizer { async init() { diff --git a/src/optimize/lazy/LazyOptimizer.js b/src/optimize/lazy/LazyOptimizer.js index 8c7588c88397d..a4ead1974f528 100644 --- a/src/optimize/lazy/LazyOptimizer.js +++ b/src/optimize/lazy/LazyOptimizer.js @@ -1,9 +1,9 @@ -let { once, pick, size } = require('lodash'); -let { join } = require('path'); import Boom from 'boom'; import BaseOptimizer from '../BaseOptimizer'; import WeirdControlFlow from './WeirdControlFlow'; +import { once, pick, size } from 'lodash'; +import { join } from 'path'; module.exports = class LazyOptimizer extends BaseOptimizer { constructor(opts) { diff --git a/src/optimize/lazy/LazyServer.js b/src/optimize/lazy/LazyServer.js index a85cf7300ac72..2f9fc1cde81bf 100644 --- a/src/optimize/lazy/LazyServer.js +++ b/src/optimize/lazy/LazyServer.js @@ -1,7 +1,7 @@ -let { Server } = require('hapi'); -let { fromNode } = require('bluebird'); import Boom from 'boom'; +import { Server } from 'hapi'; +import { fromNode } from 'bluebird'; module.exports = class LazyServer { diff --git a/src/optimize/lazy/WeirdControlFlow.js b/src/optimize/lazy/WeirdControlFlow.js index 5825c12c93464..ae37cce688283 100644 --- a/src/optimize/lazy/WeirdControlFlow.js +++ b/src/optimize/lazy/WeirdControlFlow.js @@ -1,5 +1,5 @@ +import { fromNode } from 'bluebird'; -let { fromNode } = require('bluebird'); module.exports = class WeirdControlFlow { constructor(work) { diff --git a/src/optimize/lazy/lazy.js b/src/optimize/lazy/lazy.js index 6d7d6541bcd62..9a32eb00913a6 100644 --- a/src/optimize/lazy/lazy.js +++ b/src/optimize/lazy/lazy.js @@ -1,6 +1,6 @@ +import { isWorker } from 'cluster'; module.exports = async (kbnServer, server, config) => { - let { isWorker } = require('cluster'); if (!isWorker) { throw new Error(`lazy optimization is only available in "watch" mode`); diff --git a/src/optimize/lazy/proxyRole.js b/src/optimize/lazy/proxyRole.js index df13c68b8700b..b9b0f26ed6a63 100644 --- a/src/optimize/lazy/proxyRole.js +++ b/src/optimize/lazy/proxyRole.js @@ -1,5 +1,5 @@ -let { fromNode } = require('bluebird'); -let { get, once } = require('lodash'); +import { fromNode } from 'bluebird'; +import { get, once } from 'lodash'; module.exports = (kbnServer, server, config) => { diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js index 7f9cf04470ee7..9ec30c8d93065 100644 --- a/src/plugins/elasticsearch/lib/create_proxy.js +++ b/src/plugins/elasticsearch/lib/create_proxy.js @@ -1,6 +1,6 @@ import createAgent from './create_agent'; import mapUri from './map_uri'; -const { resolve } = require('url'); +import { resolve } from 'url'; function createProxy(server, method, route, config) { diff --git a/src/plugins/kibana/public/settings/sections/indices/_create.js b/src/plugins/kibana/public/settings/sections/indices/_create.js index 720e5de639d09..4d43dc5f5272d 100644 --- a/src/plugins/kibana/public/settings/sections/indices/_create.js +++ b/src/plugins/kibana/public/settings/sections/indices/_create.js @@ -1,7 +1,7 @@ +import { IndexPatternMissingIndices } from 'ui/errors'; define(function (require) { const _ = require('lodash'); const moment = require('moment'); - const { IndexPatternMissingIndices } = require('ui/errors'); require('ui/directives/validate_index_name'); require('ui/directives/auto_select_if_only_one'); diff --git a/src/plugins/kibana/server/lib/__tests__/case_conversion.js b/src/plugins/kibana/server/lib/__tests__/case_conversion.js index 01afe2c858683..b7894126c5a5b 100644 --- a/src/plugins/kibana/server/lib/__tests__/case_conversion.js +++ b/src/plugins/kibana/server/lib/__tests__/case_conversion.js @@ -1,6 +1,6 @@ import expect from 'expect.js'; -const { keysToSnakeCaseShallow, keysToCamelCaseShallow } = require('../case_conversion'); import _ from 'lodash'; +import { keysToSnakeCaseShallow, keysToCamelCaseShallow } from '../case_conversion'; describe('keysToSnakeCaseShallow', function () { diff --git a/src/plugins/kibana/server/lib/__tests__/convert_pattern_and_template_name.js b/src/plugins/kibana/server/lib/__tests__/convert_pattern_and_template_name.js index 30fa59d9c10df..d33775b0d8e50 100644 --- a/src/plugins/kibana/server/lib/__tests__/convert_pattern_and_template_name.js +++ b/src/plugins/kibana/server/lib/__tests__/convert_pattern_and_template_name.js @@ -1,5 +1,5 @@ -const {templateToPattern, patternToTemplate} = require('../convert_pattern_and_template_name'); import expect from 'expect.js'; +import {templateToPattern, patternToTemplate} from '../convert_pattern_and_template_name'; describe('convertPatternAndTemplateName', function () { diff --git a/src/plugins/kibana/server/routes/api/ingest/register_delete.js b/src/plugins/kibana/server/routes/api/ingest/register_delete.js index 4e3623acf23b6..92a020d8435dd 100644 --- a/src/plugins/kibana/server/routes/api/ingest/register_delete.js +++ b/src/plugins/kibana/server/routes/api/ingest/register_delete.js @@ -1,6 +1,6 @@ import Promise from 'bluebird'; import handleESError from '../../../lib/handle_es_error'; -const {templateToPattern, patternToTemplate} = require('../../../lib/convert_pattern_and_template_name'); +import {templateToPattern, patternToTemplate} from '../../../lib/convert_pattern_and_template_name'; module.exports = function registerDelete(server) { server.route({ diff --git a/src/plugins/kibana/server/routes/api/ingest/register_post.js b/src/plugins/kibana/server/routes/api/ingest/register_post.js index 5bebee6b4355f..82972768c6481 100644 --- a/src/plugins/kibana/server/routes/api/ingest/register_post.js +++ b/src/plugins/kibana/server/routes/api/ingest/register_post.js @@ -1,11 +1,11 @@ import Boom from 'boom'; import _ from 'lodash'; -const {templateToPattern, patternToTemplate} = require('../../../lib/convert_pattern_and_template_name'); import indexPatternSchema from '../../../lib/schemas/resources/index_pattern_schema'; import handleESError from '../../../lib/handle_es_error'; -const { keysToCamelCaseShallow } = require('../../../lib/case_conversion'); import createMappingsFromPatternFields from '../../../lib/create_mappings_from_pattern_fields'; import initDefaultFieldProps from '../../../lib/init_default_field_props'; +import {templateToPattern, patternToTemplate} from '../../../lib/convert_pattern_and_template_name'; +import { keysToCamelCaseShallow } from '../../../lib/case_conversion'; module.exports = function registerPost(server) { server.route({ diff --git a/src/plugins/testsBundle/findSourceFiles.js b/src/plugins/testsBundle/findSourceFiles.js index 0fe27166f0c6d..c34d42daad62f 100644 --- a/src/plugins/testsBundle/findSourceFiles.js +++ b/src/plugins/testsBundle/findSourceFiles.js @@ -1,9 +1,9 @@ -let { chain, memoize } = require('lodash'); -let { resolve } = require('path'); -let { map, fromNode } = require('bluebird'); -let { Glob } = require('glob'); import fromRoot from '../../utils/fromRoot'; +import { chain, memoize } from 'lodash'; +import { resolve } from 'path'; +import { map, fromNode } from 'bluebird'; +import { Glob } from 'glob'; let findSourceFiles = async (patterns, cwd = fromRoot('.')) => { patterns = [].concat(patterns || []); diff --git a/src/plugins/testsBundle/index.js b/src/plugins/testsBundle/index.js index 903224d3657c4..9d96711abc35e 100644 --- a/src/plugins/testsBundle/index.js +++ b/src/plugins/testsBundle/index.js @@ -1,5 +1,5 @@ +import { union } from 'lodash'; module.exports = (kibana) => { - let { union } = require('lodash'); let utils = require('requirefrom')('src/utils'); let fromRoot = utils('fromRoot'); diff --git a/src/server/KbnServer.js b/src/server/KbnServer.js index bd906f758b146..89c825fc21203 100644 --- a/src/server/KbnServer.js +++ b/src/server/KbnServer.js @@ -1,6 +1,6 @@ -let { constant, once, compact, flatten } = require('lodash'); -let { promisify, resolve, fromNode } = require('bluebird'); import Hapi from 'hapi'; +import { constant, once, compact, flatten } from 'lodash'; +import { promisify, resolve, fromNode } from 'bluebird'; let utils = require('requirefrom')('src/utils'); let rootDir = utils('fromRoot')('.'); diff --git a/src/server/config/config.js b/src/server/config/config.js index 727dcf378ebd3..0cad7df89d9fe 100644 --- a/src/server/config/config.js +++ b/src/server/config/config.js @@ -1,11 +1,11 @@ import Promise from 'bluebird'; import Joi from 'joi'; import _ from 'lodash'; -let { zipObject } = require('lodash'); import override from './override'; import createDefaultSchema from './schema'; let pkg = require('requirefrom')('src/utils')('packageJson'); import clone from './deepCloneWithBuffers'; +import { zipObject } from 'lodash'; const schema = Symbol('Joi Schema'); const schemaKeys = Symbol('Schema Extensions'); diff --git a/src/server/plugins/Plugin.js b/src/server/plugins/Plugin.js index 52af59f5fcfbc..dfd12709086d9 100644 --- a/src/server/plugins/Plugin.js +++ b/src/server/plugins/Plugin.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import Joi from 'joi'; -let { attempt, fromNode } = require('bluebird'); -let { basename, resolve } = require('path'); -let { inherits } = require('util'); +import { attempt, fromNode } from 'bluebird'; +import { basename, resolve } from 'path'; +import { inherits } from 'util'; const defaultConfigSchema = Joi.object({ enabled: Joi.boolean().default(true) diff --git a/src/server/plugins/PluginApi.js b/src/server/plugins/PluginApi.js index d997491555015..5514dfd4cea20 100644 --- a/src/server/plugins/PluginApi.js +++ b/src/server/plugins/PluginApi.js @@ -1,6 +1,6 @@ import _ from 'lodash'; import Plugin from './Plugin'; -let { basename, join } = require('path'); +import { basename, join } from 'path'; module.exports = class PluginApi { constructor(kibana, pluginPath) { diff --git a/src/server/plugins/PluginCollection.js b/src/server/plugins/PluginCollection.js index 106d4702000b4..ae0a0c05021cb 100644 --- a/src/server/plugins/PluginCollection.js +++ b/src/server/plugins/PluginCollection.js @@ -1,7 +1,7 @@ -let { get, indexBy } = require('lodash'); let inspect = require('util').inspect; import PluginApi from './PluginApi'; +import { get, indexBy } from 'lodash'; let Collection = require('requirefrom')('src')('utils/Collection'); let byIdCache = Symbol('byIdCache'); diff --git a/src/server/plugins/initialize.js b/src/server/plugins/initialize.js index 0810718f91254..f54a6d3627b56 100644 --- a/src/server/plugins/initialize.js +++ b/src/server/plugins/initialize.js @@ -1,5 +1,5 @@ +import { includes, keys } from 'lodash'; module.exports = async function (kbnServer, server, config) { - let { includes, keys } = require('lodash'); if (!config.get('plugins.initialize')) { server.log(['info'], 'Plugin initialization disabled.'); diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js index 37d07e0537c09..665158585cfca 100644 --- a/src/server/plugins/scan.js +++ b/src/server/plugins/scan.js @@ -1,9 +1,9 @@ +import { fromNode } from 'bluebird'; +import { readdir, stat } from 'fs'; +import { resolve } from 'path'; +import { each } from 'bluebird'; module.exports = async (kbnServer, server, config) => { let _ = require('lodash'); - let { fromNode } = require('bluebird'); - let { readdir, stat } = require('fs'); - let { resolve } = require('path'); - let { each } = require('bluebird'); var PluginCollection = require('./PluginCollection'); var plugins = kbnServer.plugins = new PluginCollection(kbnServer); diff --git a/src/server/status/index.js b/src/server/status/index.js index 16dc436b01369..5d7418bd8ff11 100644 --- a/src/server/status/index.js +++ b/src/server/status/index.js @@ -1,7 +1,7 @@ +import { join } from 'path'; module.exports = function (kbnServer, server, config) { var _ = require('lodash'); var ServerStatus = require('./ServerStatus'); - var { join } = require('path'); kbnServer.status = new ServerStatus(kbnServer.server); diff --git a/src/ui/index.js b/src/ui/index.js index cf0945bc9ae46..0d78d07c3b306 100644 --- a/src/ui/index.js +++ b/src/ui/index.js @@ -1,8 +1,8 @@ +import { defaults } from 'lodash'; +import { resolve } from 'path'; module.exports = async (kbnServer, server, config) => { - let { defaults } = require('lodash'); let Boom = require('boom'); let formatUrl = require('url').format; - let { resolve } = require('path'); let readFile = require('fs').readFileSync; let fromRoot = require('../utils/fromRoot'); diff --git a/src/ui/public/chrome/Tab.js b/src/ui/public/chrome/Tab.js index 1fbb42b64742a..7ea8acba75a50 100644 --- a/src/ui/public/chrome/Tab.js +++ b/src/ui/public/chrome/Tab.js @@ -1,6 +1,6 @@ import _ from 'lodash'; +import { parse, format } from 'url'; const reEsc = require('lodash').escapeRegExp; -const { parse, format } = require('url'); const urlJoin = (a, b) => { if (!b) return a; diff --git a/src/ui/public/chrome/TabCollection.js b/src/ui/public/chrome/TabCollection.js index 5537f3f8747b4..81ce9266ead93 100644 --- a/src/ui/public/chrome/TabCollection.js +++ b/src/ui/public/chrome/TabCollection.js @@ -1,7 +1,7 @@ import _ from 'lodash'; -var { startsWith, get, set, omit, wrap, pick } = require('lodash'); import Tab from 'ui/chrome/Tab'; -var { parse } = require('url'); +import { startsWith, get, set, omit, wrap, pick } from 'lodash'; +import { parse } from 'url'; function TabCollection(opts = {}) { var tabs = []; diff --git a/src/ui/public/chrome/__tests__/TabCollection.js b/src/ui/public/chrome/__tests__/TabCollection.js index 0ca0feb03cfe1..ffb2bc9597c4f 100644 --- a/src/ui/public/chrome/__tests__/TabCollection.js +++ b/src/ui/public/chrome/__tests__/TabCollection.js @@ -1,9 +1,9 @@ import expect from 'expect.js'; -const { indexBy, random } = require('lodash'); import TabFakeStore from './_TabFakeStore'; import TabCollection from '../TabCollection'; import Tab from '../Tab'; +import { indexBy, random } from 'lodash'; describe('Chrome TabCollection', function () { describe('empty state', function () { diff --git a/src/ui/public/chrome/api/__tests__/xsrf.js b/src/ui/public/chrome/api/__tests__/xsrf.js index 326e2f2db84ec..09c4790772a8e 100644 --- a/src/ui/public/chrome/api/__tests__/xsrf.js +++ b/src/ui/public/chrome/api/__tests__/xsrf.js @@ -4,9 +4,9 @@ import { stub } from 'auto-release-sinon'; import ngMock from 'ngMock'; import xsrfChromeApi from '../xsrf'; +import { version } from '../../../../../../package.json'; const xsrfHeader = 'kbn-version'; -const { version } = require('../../../../../../package.json'); describe('chrome xsrf apis', function () { describe('#getXsrfToken()', function () { diff --git a/src/ui/public/chrome/api/apps.js b/src/ui/public/chrome/api/apps.js index 35342d660f654..ee6b7b1b86aff 100644 --- a/src/ui/public/chrome/api/apps.js +++ b/src/ui/public/chrome/api/apps.js @@ -1,5 +1,5 @@ -const { clone, get } = require('lodash'); -const { resolve } = require('url'); +import { clone, get } from 'lodash'; +import { resolve } from 'url'; module.exports = function (chrome, internals) { diff --git a/src/ui/public/chrome/api/nav.js b/src/ui/public/chrome/api/nav.js index 3290010911513..297df1543be3a 100644 --- a/src/ui/public/chrome/api/nav.js +++ b/src/ui/public/chrome/api/nav.js @@ -1,5 +1,5 @@ -const { startsWith, isString } = require('lodash'); import { parse, format } from 'url'; +import { startsWith, isString } from 'lodash'; export default function (chrome, internals) { chrome.getNavLinks = function () { diff --git a/src/ui/public/filter_bar/lib/mapRange.js b/src/ui/public/filter_bar/lib/mapRange.js index a0d0c5bd18eed..bee88c4764ae6 100644 --- a/src/ui/public/filter_bar/lib/mapRange.js +++ b/src/ui/public/filter_bar/lib/mapRange.js @@ -1,5 +1,5 @@ +import {has} from 'lodash'; define(function (require) { - var {has} = require('lodash'); return function mapRangeProvider(Promise, courier) { return function (filter) { if (!filter.range) return Promise.reject(filter); diff --git a/src/ui/public/index_patterns/routeSetup/loadDefault.js b/src/ui/public/index_patterns/routeSetup/loadDefault.js index 5c242f8adca62..90f02a942dedd 100644 --- a/src/ui/public/index_patterns/routeSetup/loadDefault.js +++ b/src/ui/public/index_patterns/routeSetup/loadDefault.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -let { NoDefaultIndexPattern, NoDefinedIndexPatterns } = require('ui/errors'); import Notifier from 'ui/notify/notifier'; +import { NoDefaultIndexPattern, NoDefinedIndexPatterns } from 'ui/errors'; let notify = new Notifier({ location: 'Index Patterns' }); diff --git a/src/ui/ui_app.js b/src/ui/ui_app.js index 70c0a31d3e6c3..a407c0b24c9cb 100644 --- a/src/ui/ui_app.js +++ b/src/ui/ui_app.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -var { join } = require('path'); +import { join } from 'path'; class UiApp { constructor(uiExports, spec) { diff --git a/src/ui/ui_bundle.js b/src/ui/ui_bundle.js index b610c24b7b4d0..5d0a501b0b44b 100644 --- a/src/ui/ui_bundle.js +++ b/src/ui/ui_bundle.js @@ -1,6 +1,6 @@ +import { join } from 'path'; +import { promisify } from 'bluebird'; -let { join } = require('path'); -let { promisify } = require('bluebird'); let read = promisify(require('fs').readFile); let write = promisify(require('fs').writeFile); let unlink = promisify(require('fs').unlink); diff --git a/src/ui/ui_bundle_collection.js b/src/ui/ui_bundle_collection.js index 0a4d044dfacc1..6e6b61560fa65 100644 --- a/src/ui/ui_bundle_collection.js +++ b/src/ui/ui_bundle_collection.js @@ -1,7 +1,3 @@ -let { pull, transform, pluck } = require('lodash'); -let { join } = require('path'); -let { resolve, promisify } = require('bluebird'); -let { makeRe } = require('minimatch'); let rimraf = promisify(require('rimraf')); let mkdirp = promisify(require('mkdirp')); let unlink = promisify(require('fs').unlink); @@ -10,6 +6,10 @@ let readSync = require('fs').readFileSync; import UiBundle from './ui_bundle'; import appEntryTemplate from './app_entry_template'; +import { pull, transform, pluck } from 'lodash'; +import { join } from 'path'; +import { resolve, promisify } from 'bluebird'; +import { makeRe } from 'minimatch'; class UiBundleCollection { constructor(bundlerEnv, filter) { diff --git a/src/ui/ui_bundler_env.js b/src/ui/ui_bundler_env.js index da1f133923895..b8145d49cc439 100644 --- a/src/ui/ui_bundler_env.js +++ b/src/ui/ui_bundler_env.js @@ -1,7 +1,7 @@ -let { includes, flow, escapeRegExp } = require('lodash'); -let { isString, isArray, isPlainObject, get } = require('lodash'); -let { keys } = require('lodash'); import fromRoot from '../utils/fromRoot'; +import { includes, flow, escapeRegExp } from 'lodash'; +import { isString, isArray, isPlainObject, get } from 'lodash'; +import { keys } from 'lodash'; let asRegExp = flow( escapeRegExp, diff --git a/src/utils/fromRoot.js b/src/utils/fromRoot.js index 4fa476c3859ba..d7698688257b3 100644 --- a/src/utils/fromRoot.js +++ b/src/utils/fromRoot.js @@ -1,5 +1,5 @@ import _ from 'lodash'; +import { join, dirname, normalize } from 'path'; var root = require('./packageJson').__dirname; -var { join, dirname, normalize } = require('path'); module.exports = _.flow(_.partial(join, root), normalize); diff --git a/src/utils/packageJson.js b/src/utils/packageJson.js index 9c896f0610275..290d7387c4d28 100644 --- a/src/utils/packageJson.js +++ b/src/utils/packageJson.js @@ -1,4 +1,4 @@ -var { join } = require('path'); +import { join } from 'path'; var existsSync = require('fs').existsSync; var packageDir;