Skip to content

Commit

Permalink
Merge branch 'master' into security/route-validation-audit
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Oct 28, 2019
2 parents 387ed6c + 69f47a9 commit a6486f4
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 68 deletions.
2 changes: 0 additions & 2 deletions src/dev/build/build_distributables.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ import {
ExtractNodeBuildsTask,
InstallDependenciesTask,
OptimizeBuildTask,
PatchNativeModulesTask,
RemovePackageJsonDepsTask,
RemoveWorkspacesTask,
TranspileBabelTask,
Expand Down Expand Up @@ -131,7 +130,6 @@ export async function buildDistributables(options) {
* directories and perform platform-specific steps
*/
await run(CreateArchivesSourcesTask);
await run(PatchNativeModulesTask);
await run(CleanExtraBinScriptsTask);
await run(CleanExtraBrowsersTask);
await run(CleanNodeBuildsTask);
Expand Down
1 change: 0 additions & 1 deletion src/dev/build/tasks/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@ export * from './transpile_babel_task';
export * from './transpile_scss_task';
export * from './verify_env_task';
export * from './write_sha_sums_task';
export * from './patch_native_modules_task';
export * from './path_length_task';
47 changes: 0 additions & 47 deletions src/dev/build/tasks/patch_native_modules_task.js

This file was deleted.

1 change: 0 additions & 1 deletion x-pack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
"@elastic/maki": "6.1.0",
"@elastic/node-crypto": "^1.0.0",
"@elastic/numeral": "2.3.3",
"@elastic/simple-git": "1.124.0-elastic.15",
"@kbn/babel-preset": "1.0.0",
"@kbn/config-schema": "1.0.0",
"@kbn/elastic-idx": "1.0.0",
Expand Down
18 changes: 1 addition & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1286,15 +1286,6 @@
"@types/node-jose" "1.1.0"
node-jose "1.1.0"

"@elastic/simple-git@1.124.0-elastic.15":
version "1.124.0-elastic.15"
resolved "https://registry.yarnpkg.com/@elastic/simple-git/-/simple-git-1.124.0-elastic.15.tgz#b7975e9d1aeb424c87c817e1bd0549d25ec1d2c5"
integrity sha512-Nb+WwJI9I2PN72Ue6stMUDVlqrNKuskpfKJwd+74YtyyfuV7dfHvt4FksqrjnOLbvFxJi214DZ1dHoROg3iQyQ==
dependencies:
debug "^4.0.1"
request "^2.88.0"
targz "^1.0.1"

"@elastic/ui-ace@0.2.3":
version "0.2.3"
resolved "https://registry.yarnpkg.com/@elastic/ui-ace/-/ui-ace-0.2.3.tgz#5281aed47a79b7216c55542b0675e435692f20cd"
Expand Down Expand Up @@ -26616,7 +26607,7 @@ tape@^4.5.1:
string.prototype.trim "~1.1.2"
through "~2.3.8"

tar-fs@^1.16.3, tar-fs@^1.8.1:
tar-fs@^1.16.3:
version "1.16.3"
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
Expand Down Expand Up @@ -26695,13 +26686,6 @@ tar@^4:
safe-buffer "^5.1.2"
yallist "^3.0.2"

targz@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/targz/-/targz-1.0.1.tgz#8f76a523694cdedfbb5d60a4076ff6eeecc5398f"
integrity sha1-j3alI2lM3t+7XWCkB2/27uzFOY8=
dependencies:
tar-fs "^1.8.1"

tcomb-validation@^3.3.0:
version "3.4.1"
resolved "https://registry.yarnpkg.com/tcomb-validation/-/tcomb-validation-3.4.1.tgz#a7696ec176ce56a081d9e019f8b732a5a8894b65"
Expand Down

0 comments on commit a6486f4

Please sign in to comment.