[rename] process previously dynamic imports

src/cli/cli.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 
-import pkg from '../utils/packageJson';
+import pkg from '../utils/package_json';
 import Command from './command';
 
 let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();

src/cli/cluster/cluster_manager.js

@@ -83,7 +83,7 @@ module.exports = class ClusterManager {
 
   setupWatching(extraPaths) {
     const chokidar = require('chokidar');
-    const fromRoot = require('../../utils/fromRoot');
+    const fromRoot = require('../../utils/from_root');
 
     this.watcher = chokidar.watch([
       'src/plugins',

src/cli/plugin/__tests__/setting_parser.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import expect from 'expect.js';
 
-import fromRoot from '../../../utils/fromRoot';
+import fromRoot from '../../../utils/from_root';
 import settingParser from '../setting_parser';
 
 describe('kibana cli', function () {

src/cli/plugin/plugin.js

@@ -1,4 +1,4 @@
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 import settingParser from './setting_parser';
 import installer from './plugin_installer';
 import remover from './plugin_remover';

src/cli/plugin/plugin_installer.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 import pluginDownloader from './plugin_downloader';
 import pluginCleaner from './plugin_cleaner';
 import pluginExtractor from './plugin_extractor';

src/cli/serve/read_yaml_config.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import fs from 'fs';
 import yaml from 'js-yaml';
 
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 let legacySettingMap = {
   // server

src/cli/serve/serve.js

@@ -3,7 +3,7 @@ const { isWorker } = require('cluster');
 const { resolve } = require('path');
 
 const cwd = process.cwd();
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 let canCluster;
 try {
@@ -126,7 +126,7 @@ module.exports = function (program) {
     }
 
     let kbnServer = {};
-    const KbnServer = require('../../server/KbnServer');
+    const KbnServer = require('../../server/kbn_server');
     try {
       kbnServer = new KbnServer(settings);
       await kbnServer.ready();

src/optimize/lazy/optmzr_role.js

@@ -1,6 +1,6 @@
 import LazyServer from './lazy_server';
 import LazyOptimizer from './lazy_optimizer';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 export default async (kbnServer, kibanaHapiServer, config) => {
   let server = new LazyServer(

src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js

@@ -3,7 +3,7 @@ import expect from 'expect.js';
 import sinon from 'sinon';
 
 import isUpgradeable from '../is_upgradeable';
-import pkg from '../../../../utils/packageJson';
+import pkg from '../../../../utils/package_json';
 let version = pkg.version;
 
 describe('plugins/elasticsearch', function () {

src/plugins/tests_bundle/index.js

@@ -1,7 +1,7 @@
 import { union } from 'lodash';
 
 import findSourceFiles from './find_source_files';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 export default (kibana) => {
   return new kibana.Plugin({

src/server/config/config.js

@@ -3,7 +3,7 @@ import Joi from 'joi';
 import _ from 'lodash';
 import override from './override';
 import createDefaultSchema from './schema';
-import pkg from '../../utils/packageJson';
+import pkg from '../../utils/package_json';
 import clone from './deep_clone_with_buffers';
 import { zipObject } from 'lodash';
 

src/server/config/schema.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { get } from 'lodash';
 import { randomBytes } from 'crypto';
 
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
 
 module.exports = () => Joi.object({
   pkg: Joi.object({

src/server/kbn_server.js

@@ -1,8 +1,8 @@
 import Hapi from 'hapi';
 import { constant, once, compact, flatten } from 'lodash';
 import { promisify, resolve, fromNode } from 'bluebird';
-import fromRoot from '../utils/fromRoot';
-import pkg from '../utils/packageJson';
+import fromRoot from '../utils/from_root';
+import pkg from '../utils/package_json';
 
 let rootDir = fromRoot('.');
 

src/server/plugins/plugin_collection.js

@@ -2,7 +2,7 @@
 import PluginApi from './plugin_api';
 import { inspect } from 'util';
 import { get, indexBy } from 'lodash';
-import Collection from '../../utils/Collection';
+import Collection from '../../utils/collection';
 
 let byIdCache = Symbol('byIdCache');
 let pluginApis = Symbol('pluginApis');

src/ui/ui_app_collection.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import UiApp from './ui_app';
-import Collection from '../utils/Collection';
+import Collection from '../utils/collection';
 
 let byIdCache = Symbol('byId');
 

tasks/config/babel.js

@@ -1,5 +1,5 @@
 let { defaults } = require('lodash');
-let babelOptions = require('../../src/optimize/babelOptions');
+let babelOptions = require('../../src/optimize/babel_options');
 
 module.exports = {
   build: {

tasks/config/esvm.js

@@ -2,7 +2,7 @@ module.exports = function (grunt) {
   var resolve = require('path').resolve;
   var directory = resolve(__dirname, '../../esvm');
   var dataDir = resolve(directory, 'data_dir');
-  var uiConfig = require('../../test/serverConfig');
+  var uiConfig = require('../../test/server_config');
 
   return {
     options: {

test/utils/kbn_server.js

@@ -1,8 +1,8 @@
 import { defaultsDeep, set } from 'lodash';
 import { header as basicAuthHeader } from './base_auth';
 import { kibanaUser, kibanaServer } from '../shield';
-import KbnServer from '../../src/server/KbnServer';
-import fromRoot from '../../src/utils/fromRoot';
+import KbnServer from '../../src/server/kbn_server';
+import fromRoot from '../../src/utils/from_root';
 
 const SERVER_DEFAULTS = {
   server: {