Merge remote-tracking branch 'origin/master' into feature/merge-code

Author: zfy0701

docs/api/saved-objects/bulk_get.asciidoc

@@ -23,6 +23,9 @@ contains the following properties:
 `id` (required)::
   (string) ID of object to retrieve
 
+`fields` (optional)::
+  (array) The fields to return in the object's response
+
 ==== Response body
 
 The response body will have a top level `saved_objects` property that contains

packages/kbn-interpreter/public/package.json

@@ -17,15 +17,10 @@
  * under the License.
  */
 
-export { FunctionsRegistry } from './lib/functions_registry';
-export { TypesRegistry } from './lib/types_registry';
-export { createError } from './interpreter/create_error';
-export { interpreterProvider } from './interpreter/interpret';
-export { serializeProvider } from './lib/serialize';
 export { fromExpression, toExpression, safeElementFromExpression } from './lib/ast';
 export { Fn } from './lib/fn';
 export { getType } from './lib/get_type';
-export { castProvider } from './interpreter/cast';
+export { castProvider } from './lib/cast';
 export { parse } from './lib/grammar';
 export { getByAlias } from './lib/get_by_alias';
 export { Registry } from './lib/registry';

packages/kbn-interpreter/server/package.json

@@ -27,7 +27,6 @@ const { ToolingLog, withProcRunner, pickLevelFromFlags } = require('@kbn/dev-uti
 const {
   ROOT_DIR,
   BUILD_DIR,
-  WEBPACK_CONFIG_PATH
 } = require('./paths');
 
 const unknownFlags = [];
@@ -75,7 +74,7 @@ withProcRunner(log, async (proc) => {
     env.FORCE_COLOR = 'true';
   }
 
-  log.info(`Starting babel and webpack${flags.watch ? ' in watch mode' : ''}`);
+  log.info(`Starting babel ${flags.watch ? ' in watch mode' : ''}`);
   await Promise.all([
     proc.run('babel  ', {
       cmd: 'babel',
@@ -91,18 +90,6 @@ withProcRunner(log, async (proc) => {
       env,
       cwd
     }),
-
-    proc.run('webpack', {
-      cmd: 'webpack',
-      args: [
-        '--config', relative(cwd, WEBPACK_CONFIG_PATH),
-        '--env.sourceMaps', String(Boolean(flags.dev)),
-        ...(flags.watch ? ['--watch'] : []),
-      ],
-      wait: true,
-      env,
-      cwd
-    }),
   ]);
 
   log.success('Complete');

packages/kbn-interpreter/src/common/index.js

@@ -23,9 +23,5 @@ exports.ROOT_DIR = resolve(__dirname, '../../');
 exports.SOURCE_DIR = resolve(exports.ROOT_DIR, 'src');
 exports.BUILD_DIR = resolve(exports.ROOT_DIR, 'target');
 
-exports.PLUGIN_SOURCE_DIR = resolve(exports.SOURCE_DIR, 'plugin');
-exports.PLUGIN_BUILD_DIR = resolve(exports.BUILD_DIR, 'canvas_plugin');
-
-exports.WEBPACK_CONFIG_PATH = require.resolve('./webpack.config');
 exports.BABEL_PRESET_PATH = require.resolve('@kbn/babel-preset/webpack_preset');