From f37e0f4da9879df4f74000630a5a4b8b95471ae0 Mon Sep 17 00:00:00 2001 From: spalger Date: Tue, 2 Feb 2016 15:12:10 -0700 Subject: [PATCH] [es6Modules] convert destructured exports --- src/cli/Command.js | 6 +++--- src/cli/plugin/plugin_downloader.js | 2 +- src/cli/plugin/plugin_installer.js | 2 +- src/optimize/babelOptions.build.js | 2 +- src/plugins/elasticsearch/lib/create_kibana_index.js | 2 +- src/plugins/elasticsearch/lib/map_uri.js | 2 +- src/plugins/elasticsearch/lib/upgrade_config.js | 2 +- .../kibana/public/settings/sections/objects/_objects.js | 2 +- .../kibana/server/lib/__tests__/handle_es_error.js | 2 +- src/plugins/kibana/server/lib/handle_es_error.js | 2 +- src/plugins/spyModes/public/tableSpyMode.js | 2 +- src/server/config/schema.js | 4 ++-- src/server/http/index.js | 4 ++-- src/server/logging/LogFormat.js | 2 +- src/server/logging/LogReporter.js | 4 ++-- src/server/logging/index.js | 2 +- src/server/pid/index.js | 2 +- src/server/plugins/PluginCollection.js | 2 +- src/server/status/Status.js | 2 +- src/ui/index.js | 4 ++-- src/ui/public/Binder/Binder.js | 6 +++--- src/ui/public/StackTraceMapper/SourceMapReader.js | 4 ++-- src/ui/public/StackTraceMapper/StackTraceMapper.js | 2 +- src/ui/public/agg_types/__tests__/buckets/_range.js | 2 +- src/ui/public/agg_types/buckets/date_histogram.js | 2 +- src/ui/public/agg_types/param_types/field.js | 2 +- src/ui/public/chrome/Tab.js | 2 +- .../directives/app_switcher/__tests__/app_switcher.js | 8 ++++---- .../public/chrome/directives/app_switcher/app_switcher.js | 4 ++-- src/ui/public/courier/fetch/_call_response_handlers.js | 6 +++--- src/ui/public/courier/fetch/request/segmented.js | 2 +- src/ui/public/courier/fetch/strategy/search.js | 2 +- src/ui/public/directives/__tests__/config.js | 2 +- .../public/index_patterns/__tests__/calculate_indices.js | 2 +- src/ui/public/index_patterns/__tests__/intervals.js | 2 +- src/ui/public/index_patterns/_mapper.js | 2 +- src/ui/public/routes/__tests__/_wrapRouteWithPrep.js | 2 +- src/ui/public/testHarness/testHarness.js | 2 +- src/ui/public/time_buckets/calc_auto_interval.js | 2 +- src/ui/ui_bundle_collection.js | 2 +- src/utils/fromRoot.js | 2 +- src/utils/packageJson.js | 2 +- src/utils/pathContains.js | 2 +- 43 files changed, 58 insertions(+), 58 deletions(-) diff --git a/src/cli/Command.js b/src/cli/Command.js index bd66c3b31588f..bed84797bab5e 100644 --- a/src/cli/Command.js +++ b/src/cli/Command.js @@ -1,9 +1,9 @@ import _ from 'lodash'; -let Command = require('commander').Command; -let red = require('./color').red; -let yellow = require('./color').yellow; import help from './help'; +import { Command } from 'commander'; +import { red } from './color'; +import { yellow } from './color'; Command.prototype.error = function (err) { if (err && err.message) err = err.message; diff --git a/src/cli/plugin/plugin_downloader.js b/src/cli/plugin/plugin_downloader.js index ed3f066bf0166..7b1affe39d37a 100644 --- a/src/cli/plugin/plugin_downloader.js +++ b/src/cli/plugin/plugin_downloader.js @@ -1,7 +1,7 @@ import _ from 'lodash'; -const urlParse = require('url').parse; import downloadHttpFile from './downloaders/http'; import downloadLocalFile from './downloaders/file'; +import { parse as urlParse } from 'url'; export default function createPluginDownloader(settings, logger) { let archiveType; diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js index c5e30378860cc..23684b1e85261 100644 --- a/src/cli/plugin/plugin_installer.js +++ b/src/cli/plugin/plugin_installer.js @@ -8,7 +8,7 @@ import KbnServer from '../../server/KbnServer'; import readYamlConfig from '../serve/read_yaml_config'; const { statSync, renameSync } = require('fs'); import Promise from 'bluebird'; -const rimrafSync = require('rimraf').sync; +import { sync as rimrafSync } from 'rimraf'; const mkdirp = Promise.promisify(require('mkdirp')); export default { diff --git a/src/optimize/babelOptions.build.js b/src/optimize/babelOptions.build.js index 7ac1172141b08..c58e6bee57f99 100644 --- a/src/optimize/babelOptions.build.js +++ b/src/optimize/babelOptions.build.js @@ -1,4 +1,4 @@ -var cloneDeep = require('lodash').cloneDeep; +import { cloneDeep } from 'lodash'; var fromRoot = require('path').resolve.bind(null, __dirname, '../../'); if (!process.env.BABEL_CACHE_PATH) { diff --git a/src/plugins/elasticsearch/lib/create_kibana_index.js b/src/plugins/elasticsearch/lib/create_kibana_index.js index 366480bbb1bb1..d122ef4e3214c 100644 --- a/src/plugins/elasticsearch/lib/create_kibana_index.js +++ b/src/plugins/elasticsearch/lib/create_kibana_index.js @@ -1,5 +1,5 @@ import SetupError from './setup_error'; -const format = require('util').format; +import { format } from 'util'; module.exports = function (server) { const client = server.plugins.elasticsearch.client; const index = server.config().get('kibana.index'); diff --git a/src/plugins/elasticsearch/lib/map_uri.js b/src/plugins/elasticsearch/lib/map_uri.js index a62b0d1857a58..79a2357f07086 100644 --- a/src/plugins/elasticsearch/lib/map_uri.js +++ b/src/plugins/elasticsearch/lib/map_uri.js @@ -1,5 +1,5 @@ import querystring from 'querystring'; -const resolve = require('url').resolve; +import { resolve } from 'url'; module.exports = function mapUri(server, prefix) { const config = server.config(); return function (request, done) { diff --git a/src/plugins/elasticsearch/lib/upgrade_config.js b/src/plugins/elasticsearch/lib/upgrade_config.js index afbaa7c263a40..12f26a65a7353 100644 --- a/src/plugins/elasticsearch/lib/upgrade_config.js +++ b/src/plugins/elasticsearch/lib/upgrade_config.js @@ -1,7 +1,7 @@ import Promise from 'bluebird'; import isUpgradeable from './is_upgradeable'; import _ from 'lodash'; -const format = require('util').format; +import { format } from 'util'; const utils = require('requirefrom')('src/utils'); diff --git a/src/plugins/kibana/public/settings/sections/objects/_objects.js b/src/plugins/kibana/public/settings/sections/objects/_objects.js index 702cc14130072..6f6c6140606f8 100644 --- a/src/plugins/kibana/public/settings/sections/objects/_objects.js +++ b/src/plugins/kibana/public/settings/sections/objects/_objects.js @@ -1,7 +1,7 @@ +import { saveAs } from '@spalger/filesaver'; define(function (require) { const _ = require('lodash'); const angular = require('angular'); - const saveAs = require('@spalger/filesaver').saveAs; const registry = require('plugins/kibana/settings/saved_object_registry'); const objectIndexHTML = require('plugins/kibana/settings/sections/objects/_objects.html'); const MAX_SIZE = Math.pow(2, 31) - 1; diff --git a/src/plugins/kibana/server/lib/__tests__/handle_es_error.js b/src/plugins/kibana/server/lib/__tests__/handle_es_error.js index 643e3056d52a7..d45c4a01c796e 100644 --- a/src/plugins/kibana/server/lib/__tests__/handle_es_error.js +++ b/src/plugins/kibana/server/lib/__tests__/handle_es_error.js @@ -1,7 +1,7 @@ import expect from 'expect.js'; import Boom from 'boom'; -const esErrors = require('elasticsearch').errors; import handleESError from '../handle_es_error'; +import { errors as esErrors } from 'elasticsearch'; describe('handleESError', function () { diff --git a/src/plugins/kibana/server/lib/handle_es_error.js b/src/plugins/kibana/server/lib/handle_es_error.js index 2bab692a86cad..5e4ba5a967860 100644 --- a/src/plugins/kibana/server/lib/handle_es_error.js +++ b/src/plugins/kibana/server/lib/handle_es_error.js @@ -1,6 +1,6 @@ import Boom from 'boom'; -const esErrors = require('elasticsearch').errors; import _ from 'lodash'; +import { errors as esErrors } from 'elasticsearch'; module.exports = function handleESError(error) { if (!(error instanceof Error)) { diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spyModes/public/tableSpyMode.js index d7a2981623d45..b97e84ee7ee90 100644 --- a/src/plugins/spyModes/public/tableSpyMode.js +++ b/src/plugins/spyModes/public/tableSpyMode.js @@ -1,7 +1,7 @@ +import { saveAs } from '@spalger/filesaver'; define(function (require) { function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) { const _ = require('lodash'); - const saveAs = require('@spalger/filesaver').saveAs; const tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify')); const PER_PAGE_DEFAULT = 10; diff --git a/src/server/config/schema.js b/src/server/config/schema.js index 5dd1b7d9a9a14..010f06a33e053 100644 --- a/src/server/config/schema.js +++ b/src/server/config/schema.js @@ -1,11 +1,11 @@ -let get = require('lodash').get; import Joi from 'joi'; import fs from 'fs'; import path from 'path'; +import { get } from 'lodash'; +import { randomBytes } from 'crypto'; let utils = require('requirefrom')('src/utils'); let fromRoot = utils('fromRoot'); -const randomBytes = require('crypto').randomBytes; module.exports = () => Joi.object({ pkg: Joi.object({ diff --git a/src/server/http/index.js b/src/server/http/index.js index 951d8374c5468..3ad958e73b7b1 100644 --- a/src/server/http/index.js +++ b/src/server/http/index.js @@ -1,10 +1,10 @@ +import { parse } from 'url'; +import { format } from 'url'; module.exports = async function (kbnServer, server, config) { let _ = require('lodash'); let fs = require('fs'); let Boom = require('boom'); let Hapi = require('hapi'); - let parse = require('url').parse; - let format = require('url').format; let getDefaultRoute = require('./getDefaultRoute'); diff --git a/src/server/logging/LogFormat.js b/src/server/logging/LogFormat.js index ef1898fbb2935..b4818945a982b 100644 --- a/src/server/logging/LogFormat.js +++ b/src/server/logging/LogFormat.js @@ -5,8 +5,8 @@ import numeral from '@spalger/numeral'; import ansicolors from 'ansicolors'; import stringify from 'json-stringify-safe'; import querystring from 'querystring'; -let inspect = require('util').inspect; import applyFiltersToKeys from './applyFiltersToKeys'; +import { inspect } from 'util'; function serializeError(err) { return { diff --git a/src/server/logging/LogReporter.js b/src/server/logging/LogReporter.js index 25d0dc69944ff..b517b931549fb 100644 --- a/src/server/logging/LogReporter.js +++ b/src/server/logging/LogReporter.js @@ -1,9 +1,9 @@ import _ from 'lodash'; -let Squeeze = require('good-squeeze').Squeeze; -let writeStr = require('fs').createWriteStream; import LogFormatJson from './LogFormatJson'; import LogFormatString from './log_format_string'; +import { Squeeze } from 'good-squeeze'; +import { createWriteStream as writeStr } from 'fs'; module.exports = class KbnLogger { constructor(events, config) { diff --git a/src/server/logging/index.js b/src/server/logging/index.js index ed89c1d1e649f..ba3bbe3ece35d 100644 --- a/src/server/logging/index.js +++ b/src/server/logging/index.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -let fromNode = require('bluebird').fromNode; +import { fromNode } from 'bluebird'; module.exports = function (kbnServer, server, config) { // prevent relying on kbnServer so this can be used with other hapi servers diff --git a/src/server/pid/index.js b/src/server/pid/index.js index 07fae97b32528..4584d78d81b6b 100644 --- a/src/server/pid/index.js +++ b/src/server/pid/index.js @@ -1,8 +1,8 @@ import _ from 'lodash'; import Boom from 'boom'; import Promise from 'bluebird'; +import { unlinkSync as unlink } from 'fs'; var writeFile = Promise.promisify(require('fs').writeFile); -var unlink = require('fs').unlinkSync; module.exports = Promise.method(function (kbnServer, server, config) { var path = config.get('pid.file'); diff --git a/src/server/plugins/PluginCollection.js b/src/server/plugins/PluginCollection.js index 106d4702000b4..c0f8f8cc37c39 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 { inspect } from 'util'; let Collection = require('requirefrom')('src')('utils/Collection'); let byIdCache = Symbol('byIdCache'); diff --git a/src/server/status/Status.js b/src/server/status/Status.js index 3b4a54823cab3..cc7f0162aa9d6 100644 --- a/src/server/status/Status.js +++ b/src/server/status/Status.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -let EventEmitter = require('events').EventEmitter; import states from './states'; +import { EventEmitter } from 'events'; class Status extends EventEmitter { constructor(name, server) { diff --git a/src/ui/index.js b/src/ui/index.js index cf0945bc9ae46..a723c70590a55 100644 --- a/src/ui/index.js +++ b/src/ui/index.js @@ -1,9 +1,9 @@ +import { format as formatUrl } from 'url'; +import { readFileSync as readFile } from 'fs'; 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'); let UiExports = require('./ui_exports'); diff --git a/src/ui/public/Binder/Binder.js b/src/ui/public/Binder/Binder.js index 601d78ffd5e18..9b03a078590b3 100644 --- a/src/ui/public/Binder/Binder.js +++ b/src/ui/public/Binder/Binder.js @@ -1,8 +1,8 @@ var $ = require('jquery'); import d3 from 'd3'; -var callEach = require('lodash').callEach; -var bindKey = require('lodash').bindKey; -var rest = require('lodash').rest; +import { callEach } from 'lodash'; +import { bindKey } from 'lodash'; +import { rest } from 'lodash'; function Binder($scope) { this.disposal = []; diff --git a/src/ui/public/StackTraceMapper/SourceMapReader.js b/src/ui/public/StackTraceMapper/SourceMapReader.js index 01d5b2782b24a..595617d04e6ef 100644 --- a/src/ui/public/StackTraceMapper/SourceMapReader.js +++ b/src/ui/public/StackTraceMapper/SourceMapReader.js @@ -1,6 +1,6 @@ import _ from 'lodash'; -var SourceMapConsumer = require('source-map/lib/source-map/source-map-consumer').SourceMapConsumer; -var parse = require('url').parse; +import { SourceMapConsumer } from 'source-map/lib/source-map/source-map-consumer'; +import { parse } from 'url'; function SourceMapReader(url, map) { this.smc = new SourceMapConsumer(map); diff --git a/src/ui/public/StackTraceMapper/StackTraceMapper.js b/src/ui/public/StackTraceMapper/StackTraceMapper.js index fa1c55f6c3c7c..ab299b8ebc2e3 100644 --- a/src/ui/public/StackTraceMapper/StackTraceMapper.js +++ b/src/ui/public/StackTraceMapper/StackTraceMapper.js @@ -1,12 +1,12 @@ import _ from 'lodash'; var $ = require('jquery'); -var resolve = require('bluebird').resolve; import fetch from 'exports?window.fetch!imports?Promise=bluebird!whatwg-fetch'; import setErrorStack from './setErrorStack'; import translateStackLine from './translateStackLine'; import stackLineFormat from './stackLineFormat'; import SourceMapReader from './SourceMapReader'; +import { resolve } from 'bluebird'; function StackTraceMapper() { this.maps = []; diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js index 998b0857ba642..8b5c12f33bf30 100644 --- a/src/ui/public/agg_types/__tests__/buckets/_range.js +++ b/src/ui/public/agg_types/__tests__/buckets/_range.js @@ -1,8 +1,8 @@ +import { values } from 'lodash'; describe('Range Agg', function () { var _ = require('lodash'); var ngMock = require('ngMock'); var expect = require('expect.js'); - var values = require('lodash').values; var resp = require('fixtures/agg_resp/range'); var buckets = values(resp.aggregations[1].buckets); diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js index a323e304850c5..b01cf7e8a5970 100644 --- a/src/ui/public/agg_types/buckets/date_histogram.js +++ b/src/ui/public/agg_types/buckets/date_histogram.js @@ -1,8 +1,8 @@ +import { jstz as tzDetect } from 'jstimezonedetect'; define(function (require) { return function DateHistogramAggType(timefilter, config, Private) { var _ = require('lodash'); var moment = require('moment'); - var tzDetect = require('jstimezonedetect').jstz; var BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type')); var TimeBuckets = Private(require('ui/time_buckets')); var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram')); diff --git a/src/ui/public/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js index 8a697da80f9a3..cd03260d068b7 100644 --- a/src/ui/public/agg_types/param_types/field.js +++ b/src/ui/public/agg_types/param_types/field.js @@ -1,10 +1,10 @@ +import { SavedObjectNotFound } from 'ui/errors'; define(function (require) { return function FieldAggParamFactory(Private) { var _ = require('lodash'); var editorHtml = require('ui/agg_types/controls/field.html'); var BaseAggParam = Private(require('ui/agg_types/param_types/base')); - var SavedObjectNotFound = require('ui/errors').SavedObjectNotFound; _.class(FieldAggParam).inherits(BaseAggParam); function FieldAggParam(config) { diff --git a/src/ui/public/chrome/Tab.js b/src/ui/public/chrome/Tab.js index 1fbb42b64742a..b7ef9be0c86e7 100644 --- a/src/ui/public/chrome/Tab.js +++ b/src/ui/public/chrome/Tab.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -const reEsc = require('lodash').escapeRegExp; +import { escapeRegExp as reEsc } from 'lodash'; const { parse, format } = require('url'); const urlJoin = (a, b) => { diff --git a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js index e76a215d8e010..65dfd89ad9a07 100644 --- a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js @@ -2,14 +2,14 @@ import sinon from 'auto-release-sinon'; import ngMock from 'ngMock'; var $ = require('jquery'); import expect from 'expect.js'; -var constant = require('lodash').constant; -var set = require('lodash').set; -var cloneDeep = require('lodash').cloneDeep; -var indexBy = require('lodash').indexBy; require('ui/chrome'); require('../app_switcher'); import DomLocationProvider from 'ui/domLocation'; +import { constant } from 'lodash'; +import { set } from 'lodash'; +import { cloneDeep } from 'lodash'; +import { indexBy } from 'lodash'; describe('appSwitcher directive', function () { var env; diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js index 2bf23c99684a1..d59531e4a847e 100644 --- a/src/ui/public/chrome/directives/app_switcher/app_switcher.js +++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js @@ -1,8 +1,8 @@ -var parse = require('url').parse; -var bindKey = require('lodash').bindKey; require('../app_switcher/app_switcher.less'); import DomLocationProvider from 'ui/domLocation'; +import { parse } from 'url'; +import { bindKey } from 'lodash'; require('ui/modules') .get('kibana') diff --git a/src/ui/public/courier/fetch/_call_response_handlers.js b/src/ui/public/courier/fetch/_call_response_handlers.js index 15fcd8bf9cf8e..bee86023bfbf0 100644 --- a/src/ui/public/courier/fetch/_call_response_handlers.js +++ b/src/ui/public/courier/fetch/_call_response_handlers.js @@ -1,12 +1,12 @@ +import { SearchTimeout } from 'ui/errors'; +import { RequestFailure } from 'ui/errors'; +import { ShardFailure } from 'ui/errors'; define(function (require) { return function CourierFetchCallResponseHandlers(Private, Promise) { var ABORTED = Private(require('ui/courier/fetch/_req_status')).ABORTED; var INCOMPLETE = Private(require('ui/courier/fetch/_req_status')).INCOMPLETE; var notify = Private(require('ui/courier/fetch/_notifier')); - var SearchTimeout = require('ui/errors').SearchTimeout; - var RequestFailure = require('ui/errors').RequestFailure; - var ShardFailure = require('ui/errors').ShardFailure; function callResponseHandlers(requests, responses) { return Promise.map(requests, function (req, i) { diff --git a/src/ui/public/courier/fetch/request/segmented.js b/src/ui/public/courier/fetch/request/segmented.js index 13ace5fcc0238..dd7f36e695ae9 100644 --- a/src/ui/public/courier/fetch/request/segmented.js +++ b/src/ui/public/courier/fetch/request/segmented.js @@ -1,7 +1,7 @@ +import { isNumber } from 'lodash'; define(function (require) { return function CourierSegmentedReqProvider(es, Private, Promise, Notifier, timefilter, config) { var _ = require('lodash'); - var isNumber = require('lodash').isNumber; var SearchReq = Private(require('ui/courier/fetch/request/search')); var SegmentedHandle = Private(require('ui/courier/fetch/request/_segmented_handle')); diff --git a/src/ui/public/courier/fetch/strategy/search.js b/src/ui/public/courier/fetch/strategy/search.js index 6616c2931e4c5..1868294fcd2bf 100644 --- a/src/ui/public/courier/fetch/strategy/search.js +++ b/src/ui/public/courier/fetch/strategy/search.js @@ -1,8 +1,8 @@ +import { toJson } from 'ui/utils/aggressive_parse'; define(function (require) { return function FetchStrategyForSearch(Private, Promise, timefilter) { var _ = require('lodash'); var angular = require('angular'); - var toJson = require('ui/utils/aggressive_parse').toJson; return { clientMethod: 'msearch', diff --git a/src/ui/public/directives/__tests__/config.js b/src/ui/public/directives/__tests__/config.js index fe238060eeb35..3def01185ca89 100644 --- a/src/ui/public/directives/__tests__/config.js +++ b/src/ui/public/directives/__tests__/config.js @@ -1,7 +1,7 @@ import ngMock from 'ngMock'; var $ = require('jquery'); -var assign = require('lodash').assign; import expect from 'expect.js'; +import { assign } from 'lodash'; describe('Config Directive', function () { diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js index 286e5fc022618..3a14bbff52e1f 100644 --- a/src/ui/public/index_patterns/__tests__/calculate_indices.js +++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js @@ -1,6 +1,6 @@ +import { pluck } from 'lodash'; describe('ui/index_patterns/_calculate_indices', () => { const _ = require('lodash'); - const pluck = require('lodash').pluck; const sinon = require('auto-release-sinon'); const expect = require('expect.js'); const ngMock = require('ngMock'); diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js index e938785249fe7..9ead0c9aebdfe 100644 --- a/src/ui/public/index_patterns/__tests__/intervals.js +++ b/src/ui/public/index_patterns/__tests__/intervals.js @@ -1,5 +1,5 @@ -var pluck = require('lodash').pluck; import moment from 'moment'; +import { pluck } from 'lodash'; describe('Index Patterns', function () { describe('interval.toIndexList()', function () { diff --git a/src/ui/public/index_patterns/_mapper.js b/src/ui/public/index_patterns/_mapper.js index bb41117ca2c00..6afad2991435c 100644 --- a/src/ui/public/index_patterns/_mapper.js +++ b/src/ui/public/index_patterns/_mapper.js @@ -1,9 +1,9 @@ +import { IndexPatternMissingIndices } from 'ui/errors'; define(function (require) { return function MapperService(Private, Promise, es, config, kbnIndex) { var _ = require('lodash'); var moment = require('moment'); - var IndexPatternMissingIndices = require('ui/errors').IndexPatternMissingIndices; var transformMappingIntoFields = Private(require('ui/index_patterns/_transform_mapping_into_fields')); var intervals = Private(require('ui/index_patterns/_intervals')); var patternToWildcard = Private(require('ui/index_patterns/_pattern_to_wildcard')); diff --git a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js index 2864c592cd216..f7ebc187d6e87 100644 --- a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js +++ b/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js @@ -5,7 +5,7 @@ import ngMock from 'ngMock'; import wrapRouteWithPrep from 'ui/routes/wrapRouteWithPrep'; import Promise from 'bluebird'; import _ from 'lodash'; -var stub = require('auto-release-sinon').stub; +import { stub } from 'auto-release-sinon'; require('ui/private'); diff --git a/src/ui/public/testHarness/testHarness.js b/src/ui/public/testHarness/testHarness.js index 85fb74d9e2b45..9b985cd489aad 100644 --- a/src/ui/public/testHarness/testHarness.js +++ b/src/ui/public/testHarness/testHarness.js @@ -7,9 +7,9 @@ import Nonsense from 'Nonsense'; import sinon from 'sinon'; var $ = require('jquery'); import _ from 'lodash'; -var parse = require('url').parse; import StackTraceMapper from 'ui/StackTraceMapper'; +import { parse } from 'url'; /*** the vislib tests have certain style requirements, so lets make sure they are met ***/ $('body').attr('id', 'test-harness-body'); // so we can make high priority selectors diff --git a/src/ui/public/time_buckets/calc_auto_interval.js b/src/ui/public/time_buckets/calc_auto_interval.js index a511540a743da..eeccd8b11d081 100644 --- a/src/ui/public/time_buckets/calc_auto_interval.js +++ b/src/ui/public/time_buckets/calc_auto_interval.js @@ -1,8 +1,8 @@ +import { duration as d } from 'moment'; define(function (require) { return function DateIntervalRoundingRulesProvider() { var moment = require('moment'); // these are the rounding rules used by roundInterval() - var d = require('moment').duration; var roundingRules = [ [ d(500, 'ms'), d(100, 'ms') ], diff --git a/src/ui/ui_bundle_collection.js b/src/ui/ui_bundle_collection.js index 0a4d044dfacc1..ee4ff9b57d4c1 100644 --- a/src/ui/ui_bundle_collection.js +++ b/src/ui/ui_bundle_collection.js @@ -6,10 +6,10 @@ let rimraf = promisify(require('rimraf')); let mkdirp = promisify(require('mkdirp')); let unlink = promisify(require('fs').unlink); let readdir = promisify(require('fs').readdir); -let readSync = require('fs').readFileSync; import UiBundle from './ui_bundle'; import appEntryTemplate from './app_entry_template'; +import { readFileSync as readSync } from 'fs'; class UiBundleCollection { constructor(bundlerEnv, filter) { diff --git a/src/utils/fromRoot.js b/src/utils/fromRoot.js index 4fa476c3859ba..3d5f75f7b50e6 100644 --- a/src/utils/fromRoot.js +++ b/src/utils/fromRoot.js @@ -1,5 +1,5 @@ import _ from 'lodash'; -var root = require('./packageJson').__dirname; +import { __dirname as root } from './packageJson'; 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..11a53d703e69d 100644 --- a/src/utils/packageJson.js +++ b/src/utils/packageJson.js @@ -1,5 +1,5 @@ +import { existsSync } from 'fs'; var { join } = require('path'); -var existsSync = require('fs').existsSync; var packageDir; var packagePath; diff --git a/src/utils/pathContains.js b/src/utils/pathContains.js index d482c1d5cff3a..e9d0a379def12 100644 --- a/src/utils/pathContains.js +++ b/src/utils/pathContains.js @@ -1,4 +1,4 @@ -let relative = require('path').relative; +import { relative } from 'path'; module.exports = function pathContains(root, child) { return relative(child, root).slice(0, 2) !== '..';