Changes requested on PR review for node version validator #12976

Gruntfile.js

@@ -1,4 +1,4 @@
-require('./src/babel-register');
+require('./src/setup_node_env');
 
 module.exports = function (grunt) {
   // set the config once before calling load-grunt-config

packages/kbn-plugin-helpers/lib/utils.js

@@ -7,7 +7,7 @@ function babelRegister() {
 
   try {
     // add support for moved babel-register source: https://github.com/elastic/kibana/pull/13973
-    require(resolve(plugin.kibanaRoot, 'src/babel-register'));
+    require(resolve(plugin.kibanaRoot, 'src/setup_node_env/babel_register'));
   } catch (error) {
     if (error.code === 'MODULE_NOT_FOUND') {
       require(resolve(plugin.kibanaRoot, 'src/optimize/babel/register'));

scripts/README.md

@@ -10,7 +10,7 @@ node scripts/{{script name}} --help
 
 This directory is excluded from the build and tools within it should help users discover their capabilities. Each script in this directory must:
 
-- require `src/babel-register` to bootstrap babel
+- require `src/setup_node_env` to bootstrap NodeJS environment
 - call out to source code in the [`src`](../src) or [`packages`](../packages) directories
 - react to the `--help` flag
 - run everywhere OR check and fail fast when a required OS or toolchain is not available

scripts/build.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/build/cli');

scripts/docs.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/docs/cli');

scripts/es_archiver.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/es_archiver/cli');

scripts/eslint.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/run_eslint');

scripts/functional_test_runner.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/functional_test_runner/cli');

scripts/functional_tests.js

@@ -1,4 +1,4 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../packages/kbn-test').runTestsCli([
   require.resolve('../test/functional/config.js'),
   require.resolve('../test/api_integration/config.js'),

scripts/functional_tests_server.js

@@ -1,4 +1,4 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../packages/kbn-test').startServersCli(
   require.resolve('../test/functional/config.js'),
 );

scripts/jest.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-var */
+
 // # Run Jest tests
 //
 // All args will be forwarded directly to Jest, e.g. to watch tests run:
@@ -10,8 +12,8 @@
 //
 // See all cli options in https://facebook.github.io/jest/docs/cli.html
 
-const { resolve } = require('path');
+var resolve = require('path').resolve;
 process.argv.push('--config', resolve(__dirname, '../src/dev/jest/config.js'));
 
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/jest/cli');

scripts/jest_integration.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-var */
+
 // # Run Jest integration tests
 //
 // All args will be forwarded directly to Jest, e.g. to watch tests run:
@@ -10,8 +12,8 @@
 //
 // See all cli options in https://facebook.github.io/jest/docs/cli.html
 
-const { resolve } = require('path');
+var resolve = require('path').resolve;
 process.argv.push('--config', resolve(__dirname, '../src/dev/jest/config.integration.js'));
 
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/jest/cli');

scripts/kibana.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/cli/cli');

scripts/kibana_keystore.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/cli_keystore');

scripts/kibana_plugin.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/cli_plugin/cli');

scripts/mocha.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/mocha').runMochaCli();

scripts/notice.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/notice/cli');

scripts/precommit_hook.js

@@ -1,2 +1,2 @@
-require('../src/babel-register');
+require('../src/setup_node_env');
 require('../src/dev/run_precommit_hook');

src/cli/cli.js

@@ -1,21 +1,11 @@
 import _ from 'lodash';
-import { pkg, NodeVersion } from '../utils';
+import { pkg } from '../utils';
 import Command from './command';
 import serveCommand from './serve/serve';
 
 const argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
 const program = new Command('bin/kibana');
 
-// Validates current the NodeJS version compatibility when Kibana starts.
-NodeVersion.runValidator(() => {
-  // Action to apply when validation fails: error report + exit.
-  console.error(
-    `Kibana does not support the current Node.js version ${NodeVersion.getCurrentVersion()}. `
-    + `Please use Node.js ${NodeVersion.getRequiredVersion()}.`
-  );
-  process.exit(1);
-});
-
 program
   .version(pkg.version)
   .description(

src/cli/index.js

@@ -1,2 +1,2 @@
-require('../babel-register');
+require('../setup_node_env');
 require('./cli');

src/cli_keystore/index.js

@@ -1,2 +1,2 @@
-require('../babel-register');
+require('../setup_node_env');
 require('./cli_keystore');

src/cli_plugin/index.js

@@ -1,2 +1,2 @@
-require('../babel-register');
+require('../setup_node_env');
 require('./cli');

src/dev/jest/setup/babel_polyfill.js

@@ -1,4 +1,4 @@
 // Note: In theory importing the polyfill should not be needed, as Babel should
 // include the necessary polyfills when using `babel-preset-env`, but for some
 // reason it did not work. See https://github.com/elastic/kibana/issues/14506
-import '../../../babel-register/polyfill';
+import '../../../setup_node_env/babel_register/polyfill';

src/dev/jest/ts_transform.js

@@ -1,2 +1,2 @@
-require('../../babel-register');
+require('../../setup_node_env');
 module.exports = require('./ts_transform.ts');

src/dev/mocha/run_mocha_cli.js

@@ -24,8 +24,8 @@ export function runMochaCli() {
   // check that we aren't leaking any globals
   process.argv.push('--check-leaks');
 
-  // ensure that mocha requires the babel-register script
-  process.argv.push('--require', require.resolve('../../babel-register'));
+  // ensure that mocha requires the setup_node_env script
+  process.argv.push('--require', require.resolve('../../setup_node_env'));
 
   // set default test timeout
   if (opts.timeout == null && !opts['no-timeouts']) {

src/dev/mocha/server_junit_reporter.js

@@ -1,5 +1,5 @@
-// when the reporter is loaded by mocha in child process it might be before babel-register
-require('../../babel-register');
+// when the reporter is loaded by mocha in child process it might be before setup_node_env
+require('../../setup_node_env');
 
 module.exports = require('./auto_junit_reporter').createAutoJunitReporter({
   reportName: 'Server Mocha Tests',

src/server/config/__tests__/deprecation_warnings.js

@@ -3,7 +3,7 @@ import { spawn } from 'child_process';
 import expect from 'expect.js';
 
 const RUN_KBN_SERVER_STARTUP = require.resolve('./fixtures/run_kbn_server_startup');
-const BABEL_REGISTER = require.resolve('../../../babel-register');
+const SETUP_NODE_ENV = require.resolve('../../../setup_node_env');
 const SECOND = 1000;
 
 describe('config/deprecation warnings mixin', function () {
@@ -14,7 +14,7 @@ describe('config/deprecation warnings mixin', function () {
 
   before(() => new Promise((resolve, reject) => {
     proc = spawn(process.execPath, [
-      '-r', BABEL_REGISTER,
+      '-r', SETUP_NODE_ENV,
       RUN_KBN_SERVER_STARTUP
     ], {
       stdio: ['ignore', 'pipe', 'pipe'],

src/setup_node_env/babel_register/index.js

@@ -0,0 +1,5 @@
+// register and polyfill need to happen in this
+// order and in separate files. Checkout each file
+// for a much more detailed explaination
+require('./register');
+require('./polyfill');

src/babel-register/register.js → src/setup_node_env/babel_register/register.js

@@ -3,7 +3,7 @@ const { resolve } = require('path');
 // this must happen before `require('babel-register')` and can't be changed
 // once the module has been loaded
 if (!process.env.BABEL_CACHE_PATH) {
-  process.env.BABEL_CACHE_PATH = resolve(__dirname, '../../optimize/.babelcache.json');
+  process.env.BABEL_CACHE_PATH = resolve(__dirname, '../../../optimize/.babelcache.json');
 }
 
 // paths that babel-register should ignore
@@ -32,7 +32,7 @@ if (global.__BUILT_WITH_BABEL__) {
   // 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'));
+  ignore.push(resolve(__dirname, '../../../src'));
 }
 
 // modifies all future calls to require() to automatically

src/setup_node_env/index.js

@@ -0,0 +1,3 @@
+require('./node_version_validator');
+require('./ts_node_register');
+require('./babel_register');

src/setup_node_env/node_version_validator.js

@@ -0,0 +1,15 @@
+/* eslint-disable no-var */
+
+// Note: This is written in ES5 so we can run this before anything else
+// and gives support for older NodeJS versions
+var NodeVersion = require('../utils/node_version').NodeVersion;
+
+// Validates current the NodeJS version compatibility when Kibana starts.
+NodeVersion.runValidator(function () {
+  // Action to apply when validation fails: error report + exit.
+  console.error(
+    `Kibana does not support the current Node.js version ${NodeVersion.getCurrentVersion()}. `
+    + `Please use Node.js ${NodeVersion.getRequiredVersion()}.`
+  );
+  process.exit(1);
+});

src/setup_node_env/ts_node_register.js

@@ -0,0 +1,12 @@
+// Unless we are running a prebuilt/distributable version of
+// Kibana, automatically transpile typescript to js.
+//
+// NOTE: It should run before babel.
+//
+if (!global.__BUILT_WITH_BABEL__) {
+  const { resolve } = require('path');
+  require('ts-node').register({
+    transpileOnly: true,
+    cacheDirectory: resolve(__dirname, '../../../optimize/.cache/ts-node')
+  });
+}