[babel] tweak babel options for performance and debugging

package.json

@@ -97,14 +97,15 @@
     "babel-jest": "19.0.0",
     "babel-loader": "6.2.10",
     "babel-plugin-add-module-exports": "0.2.1",
+    "babel-plugin-syntax-dynamic-import": "6.18.0",
+    "babel-plugin-transform-async-generator-functions": "6.24.1",
+    "babel-plugin-transform-class-properties": "6.24.1",
+    "babel-plugin-transform-object-rest-spread": "6.23.0",
+    "babel-plugin-transform-unicode-property-regex": "2.0.1",
     "babel-polyfill": "6.20.0",
-    "babel-preset-env": "1.1.8",
-    "babel-preset-es2015": "6.22.0",
-    "babel-preset-es2015-node": "6.1.1",
+    "babel-preset-env": "1.4.0",
     "babel-preset-react": "6.22.0",
-    "babel-preset-stage-1": "6.22.0",
     "babel-register": "6.18.0",
-    "babel-runtime": "6.20.0",
     "bluebird": "2.9.34",
     "body-parser": "1.12.0",
     "boom": "2.8.0",
@@ -204,6 +205,7 @@
   },
   "devDependencies": {
     "@elastic/eslint-config-kibana": "0.5.0",
+    "@elastic/eslint-plugin-kibana-custom": "1.0.3",
     "@spalger/babel-presets": "0.3.2",
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
@@ -219,7 +221,6 @@
     "eslint": "3.11.1",
     "eslint-plugin-babel": "4.0.0",
     "eslint-plugin-jest": "19.0.1",
-    "@elastic/eslint-plugin-kibana-custom": "1.0.3",
     "eslint-plugin-mocha": "4.7.0",
     "eslint-plugin-react": "6.10.3",
     "event-stream": "3.3.2",

src/cli/cli.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import pkg from '../utils/package_json';
+import { pkg } from '../utils';
 import Command from './command';
 import serveCommand from './serve/serve';
 

src/cli/cluster/cluster_manager.js

@@ -81,7 +81,7 @@ module.exports = class ClusterManager {
 
   setupWatching(extraPaths) {
     const chokidar = require('chokidar');
-    const fromRoot = require('../../utils/from_root');
+    const { fromRoot } = require('../../utils');
 
     const watchPaths = [
       fromRoot('src/core_plugins'),

src/cli_plugin/cli.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import pkg from '../utils/package_json';
+import { pkg } from '../utils';
 import Command from '../cli/command';
 import listCommand from './list';
 import installCommand from './install';

src/cli_plugin/install/index.js

@@ -1,7 +1,7 @@
 import { fromRoot } from '../../utils';
 import install from './install';
 import Logger from '../lib/logger';
-import pkg from '../../utils/package_json';
+import { pkg } from '../../utils';
 import { getConfig } from '../../server/path';
 import { parse, parseMilliseconds } from './settings';
 import logWarnings from '../lib/log_warnings';

src/cli_plugin/list/__tests__/settings.js

@@ -1,5 +1,5 @@
 import expect from 'expect.js';
-import fromRoot from '../../../utils/from_root';
+import { fromRoot } from '../../../utils';
 import { parse } from '../settings';
 
 describe('kibana cli', function () {

src/cli_plugin/remove/__tests__/settings.js

@@ -1,5 +1,5 @@
 import expect from 'expect.js';
-import fromRoot from '../../../utils/from_root';
+import { fromRoot } from '../../../utils';
 import { parse } from '../settings';
 
 describe('kibana cli', function () {

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

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

src/core_plugins/elasticsearch/lib/__tests__/routes.js

@@ -1,7 +1,7 @@
 import { format } from 'util';
 
 import * as kbnTestServer from '../../../../../test/utils/kbn_server';
-import fromRoot from '../../../../utils/from_root';
+import { fromRoot } from '../../../../utils';
 
 describe('plugins/elasticsearch', function () {
   describe('routes', function () {

src/core_plugins/kibana/server/lib/__tests__/manage_uuid.js

@@ -1,7 +1,7 @@
 import expect from 'expect.js';
 import sinon from 'sinon';
 import * as kbnTestServer from '../../../../../../test/utils/kbn_server.js';
-import fromRoot from '../../../../../utils/from_root';
+import { fromRoot } from '../../../../../utils';
 import manageUuid from '../manage_uuid';
 
 describe('core_plugins/kibana/server/lib', function () {

src/deprecation/__tests__/create_transform.js

@@ -1,4 +1,4 @@
-import createTransform from '../create_transform';
+import { createTransform } from '../create_transform';
 import expect from 'expect.js';
 import sinon from 'sinon';
 

src/deprecation/create_transform.js

@@ -1,7 +1,7 @@
 import { deepCloneWithBuffers as clone } from '../utils';
 import { forEach, noop } from 'lodash';
 
-export default function (deprecations) {
+export function createTransform(deprecations) {
   return (settings, log = noop) => {
     const result = clone(settings);
 

src/deprecation/deprecations/__tests__/rename.js

@@ -1,5 +1,5 @@
 import expect from 'expect.js';
-import rename from '../rename';
+import { rename } from '../rename';
 import sinon from 'sinon';
 
 describe('deprecation/deprecations', function () {

src/deprecation/deprecations/__tests__/unused.js

@@ -1,6 +1,6 @@
 import expect from 'expect.js';
 import sinon from 'sinon';
-import unused from '../unused';
+import { unused } from '../unused';
 
 describe('deprecation/deprecations', function () {
   describe('unused', function () {

src/deprecation/deprecations/index.js

@@ -1,2 +1,2 @@
-export rename from './rename';
-export unused from './unused';
+export { rename } from './rename';
+export { unused } from './unused';

src/deprecation/deprecations/rename.js

@@ -1,7 +1,7 @@
 import { get, isUndefined, noop, set } from 'lodash';
 import { unset } from '../../utils';
 
-export default function (oldKey, newKey) {
+export function rename(oldKey, newKey) {
   return (settings, log = noop) => {
     const value = get(settings, oldKey);
     if (isUndefined(value)) {

src/deprecation/deprecations/unused.js

@@ -1,7 +1,7 @@
 import { get, isUndefined, noop } from 'lodash';
 import { unset } from '../../utils';
 
-export default function (oldKey) {
+export function unused(oldKey) {
   return (settings, log = noop) => {
     const value = get(settings, oldKey);
     if (isUndefined(value)) {

src/deprecation/index.js

@@ -1,2 +1,4 @@
-export createTransform from './create_transform';
-export * as Deprecations from './deprecations';
+import { rename, unused } from './deprecations';
+
+export { createTransform } from './create_transform';
+export const Deprecations = { rename, unused };

src/optimize/babel/helpers.js

@@ -9,39 +9,47 @@ if (!env.BABEL_CACHE_PATH) {
 
 exports.webpackCacheDir = env.WEBPACK_BABEL_CACHE_DIR || fromRoot('optimize/.webpack.babelcache');
 
-exports.nodePresets = [
-  [
-    require.resolve('babel-preset-env'),
-    {
+const commonPreset = {
+  presets: [
+    require.resolve('babel-preset-react')
+  ],
+  plugins: [
+    require.resolve('babel-plugin-add-module-exports'),
+    // stage 3
+    require.resolve('babel-plugin-transform-async-generator-functions'),
+    require.resolve('babel-plugin-transform-object-rest-spread'),
+    // stage 2
+    require.resolve('babel-plugin-transform-class-properties'),
+  ],
+}
+
+exports.nodePreset = {
+  presets: [
+    [require.resolve('babel-preset-env'), {
       targets: {
         node: 'current'
-      }
-    }
+      },
+      useBuiltIns: true,
+    }],
+    commonPreset,
   ],
-  require.resolve('babel-preset-stage-1'),
-  require.resolve('babel-preset-react'),
-];
-
-exports.webpackPresets = [
-  [
-    require.resolve('babel-preset-env'),
-    {
+};
+
+exports.webpackPreset = {
+  presets: [
+    [require.resolve('babel-preset-env'), {
       targets: {
         browsers: [
           'last 2 versions',
           '> 5%',
           'Safari 7' // for PhantomJS support
         ]
-      }
-    }
+      },
+      useBuiltIns: true,
+    }],
+    commonPreset,
   ],
-  require.resolve('babel-preset-stage-1'),
-  require.resolve('babel-preset-react'),
-]
-
-exports.plugins = [
-  require.resolve('babel-plugin-add-module-exports'),
-];
+}
 
 exports.devIgnore = [
   /[\\\/](node_modules|bower_components)[\\\/]/

src/optimize/babel/options.build.js

@@ -1,19 +1,16 @@
 const {
-  nodePresets,
-  webpackPresets,
-  plugins,
+  nodePreset,
+  webpackPreset,
   buildIgnore
 } = require('./helpers');
 
 const nodeOptions = {
-  presets: nodePresets,
-  plugins,
+  presets: [nodePreset],
   ignore: buildIgnore
 };
 
 exports.webpack = {
-  presets: webpackPresets,
-  plugins: plugins
+  presets: [webpackPreset],
 };
 
 exports.node = nodeOptions;

src/optimize/babel/options.js

@@ -1,23 +1,20 @@
 // this file is not transpiled in dev
 
 const {
-  nodePresets,
-  webpackPresets,
+  nodePreset,
+  webpackPreset,
   webpackCacheDir,
-  plugins,
   devIgnore
 } = require('./helpers');
 
 const nodeOptions = {
-  presets: nodePresets,
-  plugins,
+  presets: [nodePreset],
   ignore: devIgnore
 };
 
 exports.webpack = {
   cacheDirectory: webpackCacheDir,
-  presets: webpackPresets,
-  plugins: plugins
+  presets: [webpackPreset],
 };
 
 exports.node = nodeOptions;

src/optimize/babel/polyfills.js

@@ -0,0 +1,2 @@
+// this is in it's own file so babel-preset-env can convert it to just the polyfills necessary
+require('babel-polyfill');

src/optimize/babel/register.js

@@ -1,4 +1,3 @@
 // this file is not transpiled in dev
-
-require('babel-polyfill');
 require('./options').registerNodeOptions();
+require('./polyfills');

src/optimize/base_optimizer.js

@@ -10,7 +10,7 @@ import DefinePlugin from 'webpack/lib/DefinePlugin';
 import UglifyJsPlugin from 'webpack/lib/optimize/UglifyJsPlugin';
 import { defaults, transform } from 'lodash';
 
-import fromRoot from '../utils/from_root';
+import { fromRoot } from '../utils';
 import babelOptions from './babel/options';
 import pkg from '../../package.json';
 import { setLoaderQueryParam, makeLoaderString } from './loaders';

src/server/http/__tests__/index.js

@@ -1,6 +1,6 @@
 import expect from 'expect.js';
 import * as kbnTestServer from '../../../../test/utils/kbn_server';
-import fromRoot from '../../../utils/from_root';
+import { fromRoot } from '../../../utils';
 
 describe('routes', function () {
   this.slow(10000);

src/ui/ui_bundler_env.js

@@ -1,4 +1,4 @@
-import fromRoot from '../utils/from_root';
+import { fromRoot } from '../utils';
 import { includes } from 'lodash';
 
 const arr = v => [].concat(v || []);

src/utils/__tests__/deep_clone_with_buffers.js

@@ -1,4 +1,4 @@
-import deepCloneWithBuffers from '../deep_clone_with_buffers';
+import { deepCloneWithBuffers } from '../deep_clone_with_buffers';
 import expect from 'expect.js';
 
 describe('deepCloneWithBuffers()', function () {

src/utils/__tests__/unset.js

@@ -1,4 +1,4 @@
-import unset from '../unset';
+import { unset } from '../unset';
 import expect from 'expect.js';
 
 describe('unset(obj, key)', function () {

src/utils/binder_for.js

@@ -1,6 +1,6 @@
 import { BinderBase } from './binder';
 
-export default class BinderFor extends BinderBase {
+export class BinderFor extends BinderBase {
   constructor(emitter) {
     super();
     this.emitter = emitter;
@@ -10,4 +10,3 @@ export default class BinderFor extends BinderBase {
     super.on(this.emitter, ...args);
   }
 }
-

src/utils/deep_clone_with_buffers.js

@@ -6,6 +6,6 @@ function cloneBuffersCustomizer(val) {
   }
 }
 
-export default function (vals) {
+export function deepCloneWithBuffers(vals) {
   return cloneDeep(vals, cloneBuffersCustomizer);
 }

src/utils/from_root.js

@@ -1,5 +1,6 @@
-import _ from 'lodash';
-import { __dirname as root } from './package_json';
-import { join, normalize } from 'path';
+import { pkg } from './package_json';
+import { resolve } from 'path';
 
-module.exports = _.flow(_.partial(join, root), normalize);
+export function fromRoot(...args) {
+  return resolve(pkg.__dirname, ...args);
+}

src/utils/index.js

@@ -1,11 +1,12 @@
 export { BinderBase } from './binder';
-export BinderFor from './binder_for';
-export deepCloneWithBuffers from './deep_clone_with_buffers';
-export fromRoot from './from_root';
-export pkg from './package_json';
-export unset from './unset';
-
+export { BinderFor } from './binder_for';
+export { deepCloneWithBuffers } from './deep_clone_with_buffers';
+export { fromRoot } from './from_root';
+export { pkg } from './package_json';
+export { unset } from './unset';
 export { encodeQueryComponent } from './encode_query_component';
+export { modifyUrl } from './modify_url';
+export { createToolingLog } from './tooling_log';
 
 export {
   createConcatStream,
@@ -17,6 +18,3 @@ export {
   createReduceStream,
   createSplitStream,
 } from './streams';
-
-export { modifyUrl } from './modify_url';
-export { createToolingLog } from './tooling_log';