Skip to content

Commit

Permalink
[build] more cleaning (#21746) (#21934)
Browse files Browse the repository at this point in the history 
* [build] remove npm

* remove angular-ui-bootstrap

* fix

* remove bodyParser, fetch mock to dev

* remove more packages

* remove check-hash;

* remove babel-eslint

* remove marked-text-renderer

* move fetch-mock to dev dependencies

* Revert "remove babel-eslint"

This reverts commit 37d3df9146cdab24661022b9edf4aa2fd3b14e30.

* fix npm path

* fix again

* remove entire node_modules dir

* CleanNodeTask -> CleanNodeBuildsTask

* move to node folder

* remove more
  • Loading branch information
@jbudz
jbudz authored Aug 13, 2018
1 parent a93ed9e commit e5d110c
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 352 deletions.
10 changes: 1 addition & 9 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
"@kbn/pm": "link:packages/kbn-pm",
"@kbn/test-subj-selector": "link:packages/kbn-test-subj-selector",
"@kbn/ui-framework": "link:packages/kbn-ui-framework",
"JSONStream": "1.1.1",
"abortcontroller-polyfill": "^1.1.9",
"angular": "1.6.9",
"angular-aria": "1.6.6",
Expand All @@ -101,13 +100,10 @@
"babel-polyfill": "6.20.0",
"babel-register": "6.18.0",
"bluebird": "2.9.34",
"body-parser": "1.12.0",
"boom": "5.2.0",
"brace": "0.11.1",
"bunyan": "1.7.1",
"cache-loader": "1.0.3",
"chalk": "^2.4.1",
"check-hash": "1.0.1",
"color": "1.0.3",
"commander": "2.8.1",
"compare-versions": "3.1.0",
Expand All @@ -124,7 +120,6 @@
"execa": "^0.10.0",
"expiry-js": "0.1.7",
"extract-text-webpack-plugin": "3.0.1",
"fetch-mock": "^5.13.1",
"file-loader": "1.1.4",
"font-awesome": "4.4.0",
"glob": "^7.1.2",
Expand Down Expand Up @@ -291,6 +286,7 @@
"event-stream": "3.3.2",
"expect.js": "0.3.1",
"faker": "1.1.0",
"fetch-mock": "^5.13.1",
"geckodriver": "1.10.0",
"getopts": "2.0.0",
"globby": "^8.0.1",
Expand Down Expand Up @@ -325,12 +321,10 @@
"listr": "^0.14.1",
"load-grunt-config": "0.19.2",
"makelogs": "^4.1.0",
"marked-text-renderer": "0.1.0",
"mocha": "3.3.0",
"mock-fs": "^4.4.2",
"murmurhash3js": "3.0.1",
"mutation-observer": "^1.0.3",
"ncp": "2.0.0",
"nock": "8.0.0",
"node-sass": "^4.9.0",
"pixelmatch": "4.0.2",
Expand All @@ -339,8 +333,6 @@
"proxyquire": "1.7.11",
"simple-git": "1.37.0",
"sinon": "^5.0.7",
"source-map": "0.5.6",
"source-map-support": "0.2.10",
"strip-ansi": "^3.0.1",
"supertest": "3.0.0",
"supertest-as-promised": "4.0.2",
Expand Down
2 changes: 2 additions & 0 deletions src/dev/build/build_distributables.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
CleanExtraFilesFromModulesTask,
CleanPackagesTask,
CleanTypescriptTask,
CleanNodeBuildsTask,
CleanTask,
CopySourceTask,
CreateArchivesSourcesTask,
Expand Down Expand Up @@ -120,6 +121,7 @@ export async function buildDistributables(options) {
await run(CreateArchivesSourcesTask);
await run(CleanExtraBinScriptsTask);
await run(CleanExtraBrowsersTask);
await run(CleanNodeBuildsTask);

/**
* package platform-specific builds into archives
Expand Down
1 change: 1 addition & 0 deletions src/dev/build/tasks/clean_tasks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const CleanPackagesTask = {
await deleteAll(log, [
build.resolvePath('packages'),
build.resolvePath('x-pack'),
build.resolvePath('yarn.lock'),
]);
},
};
Expand Down
35 changes: 35 additions & 0 deletions src/dev/build/tasks/nodejs/clean_node_builds_task.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/*
* Licensed to Elasticsearch B.V. under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch B.V. licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import { deleteAll } from '../../lib';

export const CleanNodeBuildsTask = {
description:
'Cleaning npm from node',

async run(config, log, build) {
for (const platform of config.getPlatforms()) {
await deleteAll(log, [
build.resolvePathForPlatform(platform, 'node/lib/node_modules'),
build.resolvePathForPlatform(platform, 'node/bin/npm'),
build.resolvePathForPlatform(platform, 'node/bin/npx'),
]);
}
},
};
1 change: 1 addition & 0 deletions src/dev/build/tasks/nodejs/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ export { getNodeDownloadInfo } from './node_download_info';
export { DownloadNodeBuildsTask } from './download_node_builds_task';
export { ExtractNodeBuildsTask } from './extract_node_builds_task';
export { VerifyExistingNodeBuildsTask } from './verify_existing_node_builds_task';
export { CleanNodeBuildsTask } from './clean_node_builds_task';
3 changes: 0 additions & 3 deletions x-pack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
"angular-resource": "1.4.9",
"angular-sanitize": "1.4.9",
"angular-ui-ace": "0.2.3",
"angular-ui-bootstrap": "1.2.5",
"babel-core": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-runtime": "^6.26.0",
Expand Down Expand Up @@ -128,7 +127,6 @@
"moment-timezone": "^0.5.14",
"ngreact": "^0.5.1",
"nodemailer": "^4.6.4",
"path-match": "1.2.4",
"pdfmake": "0.1.33",
"pivotal-ui": "13.0.1",
"pluralize": "3.1.0",
Expand Down Expand Up @@ -165,7 +163,6 @@
"unbzip2-stream": "1.0.9",
"uuid": "3.0.1",
"venn.js": "0.2.9",
"webcola": "3.3.6",
"xregexp": "3.2.0"
},
"engines": {
Expand Down
115 changes: 3 additions & 112 deletions x-pack/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,6 @@ acorn@^5.0.0, acorn@^5.1.2:
version "5.3.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"

[email protected]:
version "0.0.1"
resolved "https://registry.yarnpkg.com/add-event-listener/-/add-event-listener-0.0.1.tgz#a76229ebc64c8aefae204a16273a2f255abea2d0"

agentkeepalive@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.1.tgz#aa95aebc3a749bca5ed53e3880a09f5235b48f0c"
Expand Down Expand Up @@ -282,10 +278,6 @@ [email protected]:
version "0.2.3"
resolved "https://registry.yarnpkg.com/angular-ui-ace/-/angular-ui-ace-0.2.3.tgz#3cb903428100621a367fc7f641440e97a42a26d0"

[email protected]:
version "1.2.5"
resolved "https://registry.yarnpkg.com/angular-ui-bootstrap/-/angular-ui-bootstrap-1.2.5.tgz#b0c1eff0bf3b7a65668984a1b81820a90dc60995"

ansi-cyan@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
Expand Down Expand Up @@ -1714,21 +1706,6 @@ d3-contour@^1.1.0:
dependencies:
d3-array "^1.1.1"

d3-dispatch@1, d3-dispatch@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz#46e1491eaa9b58c358fce5be4e8bed626e7871f8"

d3-drag@1, d3-drag@^1.0.4:
version "1.2.1"
resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz#df8dd4c502fb490fc7462046a8ad98a5c479282d"
dependencies:
d3-dispatch "1"
d3-selection "1"

d3-ease@1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz#68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"

d3-format@1, d3-format@^1.2.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.1.tgz#4e19ecdb081a341dafaf5f555ee956bcfdbf167f"
Expand Down Expand Up @@ -1785,10 +1762,6 @@ d3-scale@^1.0.5:
d3-time "1"
d3-time-format "2"

d3-selection@1, d3-selection@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.2.0.tgz#1b8ec1c7cedadfb691f2ba20a4a3cfbeb71bbc88"

d3-shape@^1.1.0, d3-shape@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz#45d01538f064bafd05ea3d6d2cb748fd8c41f777"
Expand All @@ -1805,35 +1778,10 @@ d3-time@1:
version "1.0.8"
resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz#dbd2d6007bf416fe67a76d17947b784bffea1e84"

d3-timer@1, d3-timer@^1.0.5:
version "1.0.7"
resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz#df9650ca587f6c96607ff4e60cc38229e8dd8531"

d3-transition@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz#d8ef89c3b848735b060e54a39b32aaebaa421039"
dependencies:
d3-color "1"
d3-dispatch "1"
d3-ease "1"
d3-interpolate "1"
d3-selection "^1.1.0"
d3-timer "1"

d3-voronoi@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c"

d3-zoom@^1.1.4:
version "1.7.1"
resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.1.tgz#02f43b3c3e2db54f364582d7e4a236ccc5506b63"
dependencies:
d3-dispatch "1"
d3-drag "1"
d3-interpolate "1"
d3-selection "1"
d3-transition "1"

[email protected]:
version "3.5.6"
resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.6.tgz#9451c651ca733fb9672c81fb7f2655164a73a42d"
Expand Down Expand Up @@ -2770,12 +2718,6 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
mkdirp ">=0.5 0"
rimraf "2"

fullscreen@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/fullscreen/-/fullscreen-1.1.1.tgz#b9017c3bf9b23e07effd1bbce910cf5ec2459129"
dependencies:
add-event-listener "0.0.1"

function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
Expand Down Expand Up @@ -3106,19 +3048,6 @@ graceful-fs@~1.2.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

graphlib-dot@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/graphlib-dot/-/graphlib-dot-0.6.2.tgz#872e933d0bb349430cb813a2491943d1c5f1e952"
dependencies:
graphlib "^1.0.1"
lodash "^2.4.1"

graphlib@^1.0.1:
version "1.0.7"
resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-1.0.7.tgz#0cab2df0ffe6abe070b2625bfa1edb6ec967b8b1"
dependencies:
lodash "^3.10.0"

[email protected]:
version "1.9.2"
resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
Expand Down Expand Up @@ -3503,13 +3432,6 @@ [email protected]:
version "3.8.1"
resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"

http-errors@~1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.4.0.tgz#6c0242dea6b3df7afda153c71089b31c6e82aabf"
dependencies:
inherits "2.0.1"
statuses ">= 1.2.1 < 2"

http-signature@~1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
Expand Down Expand Up @@ -3590,10 +3512,6 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1,
version "2.0.3"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"

[email protected]:
version "2.0.1"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"

ini@^1.3.4, ini@~1.3.0:
version "1.3.5"
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
Expand Down Expand Up @@ -4345,10 +4263,6 @@ [email protected]:
moment "2.x.x"
topo "2.x.x"

jquery@^3.1.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"

jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
Expand Down Expand Up @@ -4826,11 +4740,11 @@ lodash.uniqueid@^3.0.0:
dependencies:
lodash._root "^3.0.0"

[email protected], lodash@^2.4.1:
[email protected]:
version "2.4.2"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"

[email protected], lodash@^3.10.0, lodash@^3.10.1:
[email protected], lodash@^3.10.1:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"

Expand Down Expand Up @@ -5764,13 +5678,6 @@ path-key@^2.0.0, path-key@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"

[email protected]:
version "1.2.4"
resolved "https://registry.yarnpkg.com/path-match/-/path-match-1.2.4.tgz#a62747f3c7e0c2514762697f24443585b09100ea"
dependencies:
http-errors "~1.4.0"
path-to-regexp "^1.0.0"

path-parse@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
Expand All @@ -5785,7 +5692,7 @@ path-root@^0.1.1:
dependencies:
path-root-regex "^0.1.0"

path-to-regexp@^1.0.0, path-to-regexp@^1.7.0:
path-to-regexp@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
dependencies:
Expand Down Expand Up @@ -7292,10 +7199,6 @@ static-module@^1.1.0:
static-eval "~0.2.0"
through2 "~0.4.1"

"statuses@>= 1.2.1 < 2":
version "1.4.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"

stdout-stream@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
Expand Down Expand Up @@ -8128,18 +8031,6 @@ watch@~0.18.0:
exec-sh "^0.2.0"
minimist "^1.2.0"

[email protected]:
version "3.3.6"
resolved "https://registry.yarnpkg.com/webcola/-/webcola-3.3.6.tgz#6ec0bc7a72b3c467a2f2346a8667d88b439a03b4"
dependencies:
d3-dispatch "^1.0.3"
d3-drag "^1.0.4"
d3-timer "^1.0.5"
d3-zoom "^1.1.4"
fullscreen "^1.1.0"
graphlib-dot "^0.6.2"
jquery "^3.1.1"

webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
Expand Down
Loading

0 comments on commit e5d110c

Please sign in to comment.