diff options
author | Tiago Costa <tiagoffcc@hotmail.com> | 2018-05-25 18:43:01 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-25 18:43:01 +0100 |
commit | 194aba149fc0bb140496435dbd82161e2d6bc278 (patch) | |
tree | 8e71d4f8cd30c37815ee570bf841137f9d4309ef /scripts | |
parent | ee041de2163855df7d6b94d1098b5c32f982b90d (diff) |
Validate current node version (#19154)
* feat(12976): node version validation at runtime.
* refact(12976): move the code into a static utilities class.
* test(12976): added first test case using jest.
* test(12976): added test cases for node_version.
* feat(12976): create setup env node to bootstrap babel, ts-node and node version validator.
* refact(12976): migrated node version code from es6 to es5.
* feat(12976): node version validation at runtime.
* refact(12976): move the code into a static utilities class.
* test(12976): added first test case using jest.
* test(12976): added test cases for node_version.
* feat(12976): create setup env node to bootstrap babel, ts-node and node version validator.
* refact(12976): migrated node version code from es6 to es5.
* fix(12976): remove one level from ts node register cache directory link.
* chore(12976): added caret to semver dependecy in order to support minor versions.
* refact(12976): small change from named import to default import on node version validator.
* refact(12976): removed ts_node_register and add the code to babel_register.
* feat(12976): split eslint config in order to properly support files built to run before and after node version validator. refact(12976): convert script files to es5 code. refact(12976): delete inline eslint configs from node version check related files.
* refact(12976): remove ts node register file.
* refact(12976): completely port setup_node_env to es5.
* refact(12976): remove babel_register invokation from external dependencies in scripts.
* refact(12976): move node_version code directly into node_version_validator inside setup_node_env folder.
* refact(12976): only node version validator for kbn script.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/README.md | 2 | ||||
-rwxr-xr-x | scripts/backport.js | 1 | ||||
-rw-r--r-- | scripts/build.js | 2 | ||||
-rw-r--r-- | scripts/docs.js | 2 | ||||
-rw-r--r-- | scripts/es.js | 14 | ||||
-rwxr-xr-x | scripts/es_archiver.js | 2 | ||||
-rw-r--r-- | scripts/eslint.js | 2 | ||||
-rw-r--r-- | scripts/functional_test_runner.js | 2 | ||||
-rw-r--r-- | scripts/functional_tests.js | 2 | ||||
-rw-r--r-- | scripts/functional_tests_server.js | 2 | ||||
-rw-r--r-- | scripts/generate_plugin.js | 1 | ||||
-rwxr-xr-x | scripts/jest.js | 4 | ||||
-rwxr-xr-x | scripts/jest_integration.js | 4 | ||||
-rw-r--r-- | scripts/kbn.js | 1 | ||||
-rw-r--r-- | scripts/kibana.js | 2 | ||||
-rw-r--r-- | scripts/kibana_keystore.js | 2 | ||||
-rw-r--r-- | scripts/kibana_plugin.js | 2 | ||||
-rw-r--r-- | scripts/makelogs.js | 1 | ||||
-rw-r--r-- | scripts/mocha.js | 2 | ||||
-rw-r--r-- | scripts/notice.js | 2 | ||||
-rw-r--r-- | scripts/precommit_hook.js | 2 | ||||
-rw-r--r-- | scripts/tslint.js | 2 |
22 files changed, 31 insertions, 25 deletions
diff --git a/scripts/README.md b/scripts/README.md index ab8d53bab..f41254dc3 100644 --- a/scripts/README.md +++ b/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 diff --git a/scripts/backport.js b/scripts/backport.js index 52546548a..34d54d658 100755 --- a/scripts/backport.js +++ b/scripts/backport.js @@ -1 +1,2 @@ +require('../src/setup_node_env/node_version_validator'); require('backport'); diff --git a/scripts/build.js b/scripts/build.js index b669642d5..cac21fb0c 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/dev/build/cli'); diff --git a/scripts/docs.js b/scripts/docs.js index 7d7d262c6..19030cdbb 100644 --- a/scripts/docs.js +++ b/scripts/docs.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/docs/cli'); diff --git a/scripts/es.js b/scripts/es.js index 556714c51..8959dc218 100644 --- a/scripts/es.js +++ b/scripts/es.js @@ -1,16 +1,18 @@ -const path = require('path'); -const pkg = require('../package.json'); -const kbnEs = require('@kbn/es'); +var resolve = require('path').resolve; +var pkg = require('../package.json'); +var kbnEs = require('@kbn/es'); + +require('../src/setup_node_env'); kbnEs .run({ license: 'basic', password: 'changeme', version: pkg.version, - 'source-path': path.resolve(__dirname, '../../elasticsearch'), - 'base-path': path.resolve(__dirname, '../.es'), + 'source-path': resolve(__dirname, '../../elasticsearch'), + 'base-path': resolve(__dirname, '../.es'), }) - .catch(e => { + .catch(function (e) { console.error(e); process.exitCode = 1; }); diff --git a/scripts/es_archiver.js b/scripts/es_archiver.js index 7b8674fbb..827620c3c 100755 --- a/scripts/es_archiver.js +++ b/scripts/es_archiver.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/es_archiver/cli'); diff --git a/scripts/eslint.js b/scripts/eslint.js index e517abad2..705d407df 100644 --- a/scripts/eslint.js +++ b/scripts/eslint.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/dev/run_eslint'); diff --git a/scripts/functional_test_runner.js b/scripts/functional_test_runner.js index 003b50d58..74ef1bd12 100644 --- a/scripts/functional_test_runner.js +++ b/scripts/functional_test_runner.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/functional_test_runner/cli'); diff --git a/scripts/functional_tests.js b/scripts/functional_tests.js index 5b946f026..46fb25b78 100644 --- a/scripts/functional_tests.js +++ b/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'), diff --git a/scripts/functional_tests_server.js b/scripts/functional_tests_server.js index a26e14de9..5cbe0d107 100644 --- a/scripts/functional_tests_server.js +++ b/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'), ); diff --git a/scripts/generate_plugin.js b/scripts/generate_plugin.js index cb9f2c8cf..6161e11f9 100644 --- a/scripts/generate_plugin.js +++ b/scripts/generate_plugin.js @@ -1 +1,2 @@ +require('../src/setup_node_env'); require('@kbn/plugin-generator').run(process.argv.slice(2)); diff --git a/scripts/jest.js b/scripts/jest.js index c859142c9..d4d6c47d4 100755 --- a/scripts/jest.js +++ b/scripts/jest.js @@ -10,8 +10,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'); diff --git a/scripts/jest_integration.js b/scripts/jest_integration.js index ddb26939b..143148f90 100755 --- a/scripts/jest_integration.js +++ b/scripts/jest_integration.js @@ -10,8 +10,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'); diff --git a/scripts/kbn.js b/scripts/kbn.js index b4aa213f0..782c712af 100644 --- a/scripts/kbn.js +++ b/scripts/kbn.js @@ -1,2 +1,3 @@ +require('../src/setup_node_env/node_version_validator'); require('../packages/kbn-pm/cli'); diff --git a/scripts/kibana.js b/scripts/kibana.js index c4c655c85..06b2a0794 100644 --- a/scripts/kibana.js +++ b/scripts/kibana.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/cli/cli'); diff --git a/scripts/kibana_keystore.js b/scripts/kibana_keystore.js index c4579dc06..a99bf878c 100644 --- a/scripts/kibana_keystore.js +++ b/scripts/kibana_keystore.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/cli_keystore'); diff --git a/scripts/kibana_plugin.js b/scripts/kibana_plugin.js index 5bd1304a5..2263d1f6d 100644 --- a/scripts/kibana_plugin.js +++ b/scripts/kibana_plugin.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/cli_plugin/cli'); diff --git a/scripts/makelogs.js b/scripts/makelogs.js index b1cc91bfb..aed9d77ec 100644 --- a/scripts/makelogs.js +++ b/scripts/makelogs.js @@ -1 +1,2 @@ +require('../src/setup_node_env/node_version_validator'); require('makelogs'); diff --git a/scripts/mocha.js b/scripts/mocha.js index 88d2d91b6..f932eaba8 100644 --- a/scripts/mocha.js +++ b/scripts/mocha.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/dev/mocha').runMochaCli(); diff --git a/scripts/notice.js b/scripts/notice.js index 2f8dda3ab..45d39820c 100644 --- a/scripts/notice.js +++ b/scripts/notice.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/dev/notice/cli'); diff --git a/scripts/precommit_hook.js b/scripts/precommit_hook.js index 857755567..e6a461075 100644 --- a/scripts/precommit_hook.js +++ b/scripts/precommit_hook.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/dev/run_precommit_hook'); diff --git a/scripts/tslint.js b/scripts/tslint.js index 74613741b..5b96e8e17 100644 --- a/scripts/tslint.js +++ b/scripts/tslint.js @@ -1,2 +1,2 @@ -require('../src/babel-register'); +require('../src/setup_node_env'); require('../src/dev/tslint').runTslintCli(); |