Merge branch 'master' into internal_check_fix

package.json

@@ -115,6 +115,8 @@
     ]
   },
   "dependencies": {
+    "@babel/core": "^7.11.1",
+    "@babel/register": "^7.10.5",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.1",
     "@elastic/eui": "29.0.0",
@@ -126,6 +128,7 @@
     "@hapi/wreck": "^15.0.2",
     "@kbn/analytics": "1.0.0",
     "@kbn/apm-config-loader": "1.0.0",
+    "@kbn/babel-preset": "1.0.0",
     "@kbn/config": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/i18n": "1.0.0",
@@ -211,7 +214,6 @@
     "rxjs": "^6.5.5",
     "seedrandom": "^3.0.5",
     "semver": "^5.7.0",
-    "source-map-support": "^0.5.19",
     "style-it": "^2.1.3",
     "symbol-observable": "^1.2.0",
     "tar": "4.4.13",
@@ -225,9 +227,7 @@
     "yauzl": "^2.10.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.1",
     "@babel/parser": "^7.11.2",
-    "@babel/register": "^7.10.5",
     "@babel/types": "^7.11.0",
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/charts": "23.0.0",
@@ -238,7 +238,6 @@
     "@elastic/github-checks-reporter": "0.0.20b3",
     "@elastic/makelogs": "^6.0.0",
     "@elastic/ui-ace": "0.2.3",
-    "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/es-archiver": "1.0.0",

packages/kbn-babel-preset/node_preset.js

@@ -49,5 +49,13 @@ module.exports = (_, options = {}) => {
       ],
       require('./common_preset'),
     ],
+    plugins: [
+      [
+        require.resolve('babel-plugin-transform-define'),
+        {
+          'global.__BUILT_WITH_BABEL__': 'true',
+        },
+      ],
+    ],
   };
 };

packages/kbn-babel-preset/package.json

@@ -14,6 +14,7 @@
     "@babel/preset-typescript": "^7.10.4",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-styled-components": "^1.10.7",
+    "babel-plugin-transform-define": "^1.3.1",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "react-is": "^16.8.0",
     "styled-components": "^5.1.0"

packages/kbn-test/src/functional_tests/lib/run_kibana_server.js

@@ -17,26 +17,9 @@
  * under the License.
  */
 
-import { resolve, relative } from 'path';
+import { resolve } from 'path';
 import { KIBANA_ROOT, KIBANA_EXEC, KIBANA_EXEC_PATH } from './paths';
 
-function extendNodeOptions(installDir) {
-  if (!installDir) {
-    return {};
-  }
-
-  const testOnlyRegisterPath = relative(
-    installDir,
-    require.resolve('./babel_register_for_test_plugins')
-  );
-
-  return {
-    NODE_OPTIONS: `--require=${testOnlyRegisterPath}${
-      process.env.NODE_OPTIONS ? ` ${process.env.NODE_OPTIONS}` : ''
-    }`,
-  };
-}
-
 export async function runKibanaServer({ procs, config, options }) {
   const { installDir } = options;
 
@@ -46,7 +29,6 @@ export async function runKibanaServer({ procs, config, options }) {
     env: {
       FORCE_COLOR: 1,
       ...process.env,
-      ...extendNodeOptions(installDir),
     },
     cwd: installDir || KIBANA_ROOT,
     wait: /http server running/,

scripts/build_plugin_list_docs.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/dev-utils').runPluginListCli();

scripts/es.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 
 var resolve = require('path').resolve;
 var pkg = require('../package.json');

scripts/generate_plugin.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/plugin-generator').runCli();

scripts/plugin_helpers.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/plugin-helpers').runCli();

scripts/register_git_hook.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/dev-utils/target/precommit_hook/cli');

scripts/release_notes.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/release-notes').runReleaseNotesCli();

scripts/telemetry_check.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/telemetry-tools').runTelemetryCheck();

scripts/telemetry_extract.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('../src/setup_node_env/no_transpilation');
+require('../src/setup_node_env/prebuilt_dev_only_entry');
 require('@kbn/telemetry-tools').runTelemetryExtract();

src/cli/index.js

@@ -18,6 +18,5 @@
  */
 
 require('../apm')();
-require('../setup_node_env/no_transpilation');
-require('../setup_node_env/babel_register/polyfill');
+require('../setup_node_env');
 require('./cli');

src/cli/serve/integration_tests/invalid_config.test.ts

@@ -18,10 +18,10 @@
  */
 
 import { spawnSync } from 'child_process';
+import { resolve } from 'path';
 
-import { REPO_ROOT } from '@kbn/dev-utils';
-
-const INVALID_CONFIG_PATH = require.resolve('./__fixtures__/invalid_config.yml');
+const ROOT_DIR = resolve(__dirname, '../../../../');
+const INVALID_CONFIG_PATH = resolve(__dirname, '__fixtures__/invalid_config.yml');
 
 interface LogEntry {
   message: string;
@@ -35,11 +35,11 @@ describe('cli invalid config support', function () {
     function () {
       // Unused keys only throw once LegacyService starts, so disable migrations so that Core
       // will finish the start lifecycle without a running Elasticsearch instance.
-      const { error, status, stdout, stderr } = spawnSync(
+      const { error, status, stdout } = spawnSync(
         process.execPath,
-        ['scripts/kibana', '--config', INVALID_CONFIG_PATH, '--migrations.skip=true'],
+        ['src/cli', '--config', INVALID_CONFIG_PATH, '--migrations.skip=true'],
         {
-          cwd: REPO_ROOT,
+          cwd: ROOT_DIR,
         }
       );
 
@@ -57,21 +57,13 @@ describe('cli invalid config support', function () {
         }));
 
       expect(error).toBe(undefined);
-
-      if (!fatalLogLine) {
-        throw new Error(
-          `cli did not log the expected fatal error message:\n\nstdout: \n${stdout}\n\nstderr:\n${stderr}`
-        );
-      }
-
+      expect(status).toBe(64);
       expect(fatalLogLine.message).toContain(
         'Error: Unknown configuration key(s): "unknown.key", "other.unknown.key", "other.third", "some.flat.key", ' +
           '"some.array". Check for spelling errors and ensure that expected plugins are installed.'
       );
       expect(fatalLogLine.tags).toEqual(['fatal', 'root']);
       expect(fatalLogLine.type).toEqual('log');
-
-      expect(status).toBe(64);
     },
     20 * 1000
   );

src/dev/build/tasks/copy_source_task.ts

@@ -37,8 +37,6 @@ export const CopySource: Task = {
         '!src/cli/repl/**',
         '!src/functional_test_runner/**',
         '!src/dev/**',
-        '!src/setup_node_env/babel_register/index.js',
-        '!src/setup_node_env/babel_register/register.js',
         '!**/public/**',
         'typings/**',
         'config/kibana.yml',

src/setup_node_env/babel_register/register.js

@@ -46,13 +46,27 @@ var ignore = [
 
   // ignore paths matching `/canvas/canvas_plugin/`
   /[\/\\]canvas[\/\\]canvas_plugin[\/\\]/,
-
-  // ignore any path in the packages, unless it is in the package's
-  // root `src` directory, in any test or __tests__ directory, or it
-  // ends with .test.js, .test.ts, or .test.tsx
-  /[\/\\]packages[\/\\](eslint-|kbn-)[^\/\\]+[\/\\](?!src[\/\\].*|(.+[\/\\])?(test|__tests__)[\/\\].+|.+\.test\.(js|ts|tsx)$)(.+$)/,
 ];
 
+if (global.__BUILT_WITH_BABEL__) {
+  // when building the Kibana source we replace the statement
+  // `global.__BUILT_WITH_BABEL__` with the value `true` so that
+  // when @babel/register is required for the first time by users
+  // it will exclude kibana's `src` directory.
+  //
+  // We still need @babel/register for plugins though, we've been
+  // building their server code at require-time since version 4.2
+  // TODO: the plugin install process could transpile plugin server code...
+  ignore.push(resolve(__dirname, '../../../src'));
+} else {
+  ignore.push(
+    // ignore any path in the packages, unless it is in the package's
+    // root `src` directory, in any test or __tests__ directory, or it
+    // ends with .test.js, .test.ts, or .test.tsx
+    /[\/\\]packages[\/\\](eslint-|kbn-)[^\/\\]+[\/\\](?!src[\/\\].*|(.+[\/\\])?(test|__tests__)[\/\\].+|.+\.test\.(js|ts|tsx)$)(.+$)/
+  );
+}
+
 // modifies all future calls to require() to automatically
 // compile the required source with babel
 require('@babel/register')({

src/setup_node_env/index.js

@@ -17,5 +17,5 @@
  * under the License.
  */
 
-require('./no_transpilation');
+require('./prebuilt_dev_only_entry');
 require('./babel_register');

x-pack/package.json

@@ -32,7 +32,6 @@
     "@cypress/webpack-preprocessor": "^5.4.1",
     "@elastic/apm-rum-react": "^1.2.5",
     "@elastic/maki": "6.3.0",
-    "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/expect": "1.0.0",
@@ -281,6 +280,7 @@
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
     "@elastic/safer-lodash-set": "0.0.0",
+    "@kbn/babel-preset": "1.0.0",
     "@kbn/config-schema": "1.0.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/interpreter": "1.0.0",

x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/index.test.tsx

@@ -14,6 +14,14 @@ jest.mock('../../../../common/lib/kibana', () => ({
     services: {
       application: {
         getUrlForApp: jest.fn(),
+        capabilities: {
+          siem: {
+            crud: true,
+          },
+          actions: {
+            read: true,
+          },
+        },
       },
       triggers_actions_ui: {
         actionTypeRegistry: jest.fn(),