Skip to content

Commit bdb9c2c

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into fix/remove-imports-for-core-utils
2 parents b8ba296 + e5d7bb6 commit bdb9c2c

468 files changed

Lines changed: 12607 additions & 1573 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci/es-snapshots/Jenkinsfile_verify_es‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ currentBuild.description = "ES: ${SNAPSHOT_VERSION}<br />Kibana: ${params.branch
1919

2020
def SNAPSHOT_MANIFEST = "https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${SNAPSHOT_VERSION}/archives/${SNAPSHOT_ID}/manifest.json"
2121

22-
kibanaPipeline(timeoutMinutes: 120) {
22+
kibanaPipeline(timeoutMinutes: 150) {
2323
catchErrors {
2424
slackNotifications.onFailure(
2525
title: ":broken_heart: *<${env.BUILD_URL}|[${SNAPSHOT_VERSION}] ES Snapshot Verification Failure>*",

‎.github/paths-labeller.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
- "Feature:ExpressionLanguage":
99
- "src/plugins/expressions/**/*.*"
1010
- "src/plugins/bfetch/**/*.*"
11-
- "Team:apm"
11+
- "Team:apm":
1212
- "x-pack/plugins/apm/**/*.*"
1313
- "x-pack/plugins/apm/**/*.*"
1414
- "Team:uptime":
1515
- "x-pack/plugins/uptime/**/*.*"
16-
- "x-pack/legacy/plugins/uptime/**/*.*"

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"@babel/core": "^7.9.0",
123123
"@babel/register": "^7.9.0",
124124
"@elastic/apm-rum": "^5.1.1",
125-
"@elastic/charts": "19.1.2",
125+
"@elastic/charts": "19.2.0",
126126
"@elastic/datemath": "5.0.3",
127127
"@elastic/ems-client": "7.8.0",
128128
"@elastic/eui": "22.3.0",
@@ -200,7 +200,7 @@
200200
"inert": "^5.1.0",
201201
"inline-style": "^2.0.0",
202202
"joi": "^13.5.2",
203-
"jquery": "^3.4.1",
203+
"jquery": "^3.5.0",
204204
"js-yaml": "3.13.1",
205205
"json-stable-stringify": "^1.0.1",
206206
"json-stringify-pretty-compact": "1.2.0",
@@ -297,6 +297,7 @@
297297
"@elastic/eslint-plugin-eui": "0.0.2",
298298
"@elastic/github-checks-reporter": "0.0.20b3",
299299
"@elastic/makelogs": "^5.0.1",
300+
"@elastic/static-fs": "1.0.1",
300301
"@kbn/dev-utils": "1.0.0",
301302
"@kbn/es": "1.0.0",
302303
"@kbn/eslint-import-resolver-kibana": "2.0.0",

‎packages/kbn-ui-framework/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"html": "1.0.0",
5151
"html-loader": "^0.5.5",
5252
"imports-loader": "^0.8.0",
53-
"jquery": "^3.4.1",
53+
"jquery": "^3.5.0",
5454
"keymirror": "0.1.1",
5555
"moment": "^2.24.0",
5656
"node-sass": "^4.13.1",

‎packages/kbn-ui-shared-deps/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"kbn:watch": "node scripts/build --watch"
1010
},
1111
"dependencies": {
12-
"@elastic/charts": "19.1.2",
12+
"@elastic/charts": "19.2.0",
1313
"@elastic/eui": "22.3.0",
1414
"@kbn/i18n": "1.0.0",
1515
"abortcontroller-polyfill": "^1.4.0",
@@ -18,7 +18,7 @@
1818
"core-js": "^3.6.4",
1919
"custom-event-polyfill": "^0.3.0",
2020
"elasticsearch-browser": "^16.7.0",
21-
"jquery": "^3.4.1",
21+
"jquery": "^3.5.0",
2222
"moment": "^2.24.0",
2323
"moment-timezone": "^0.5.27",
2424
"monaco-editor": "~0.17.0",

‎scripts/kibana.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
require('../src/apm')(process.env.ELASTIC_APM_PROXY_SERVICE_NAME || 'kibana-proxy');
2120
require('../src/setup_node_env');
21+
require('../src/apm')(process.env.ELASTIC_APM_PROXY_SERVICE_NAME || 'kibana-proxy');
2222
require('../src/cli/cli');

‎src/cli/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
* under the License.
1818
*/
1919

20-
require('../apm')();
2120
require('../setup_node_env');
21+
require('../apm')();
2222
require('./cli');

‎src/dev/build/build_distributables.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import {
4040
CreatePackageJsonTask,
4141
CreateReadmeTask,
4242
CreateRpmPackageTask,
43+
CreateStaticFsWithNodeModulesTask,
4344
DownloadNodeBuildsTask,
4445
ExtractNodeBuildsTask,
4546
InstallDependenciesTask,
@@ -126,6 +127,7 @@ export async function buildDistributables(options) {
126127
await run(CleanTypescriptTask);
127128
await run(CleanExtraFilesFromModulesTask);
128129
await run(CleanEmptyFoldersTask);
130+
await run(CreateStaticFsWithNodeModulesTask);
129131

130132
/**
131133
* copy generic build outputs into platform-specific build

‎src/dev/build/tasks/create_static_fs_with_node_modules_task.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Licensed to Elasticsearch B.V. under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch B.V. licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
import del from 'del';
21+
import globby from 'globby';
22+
import { resolve } from 'path';
23+
import { generateStaticFsVolume } from '@elastic/static-fs';
24+
25+
async function deletePathsList(list) {
26+
for (const path of list) {
27+
await del(path);
28+
}
29+
}
30+
31+
async function getTopLevelNodeModulesFolders(rootDir) {
32+
const nodeModulesFoldersForCwd = await globby(['**/node_modules', '!**/node_modules/**/*'], {
33+
cwd: rootDir,
34+
onlyDirectories: true,
35+
});
36+
37+
return nodeModulesFoldersForCwd.map(folder => resolve(rootDir, folder));
38+
}
39+
40+
export const CreateStaticFsWithNodeModulesTask = {
41+
description:
42+
'Creating static filesystem with node_modules, patching entryPoints and deleting node_modules folder',
43+
44+
async run(config, log, build) {
45+
const rootDir = build.resolvePath('.');
46+
47+
// Get all the top node_modules folders
48+
const nodeModulesFolders = await getTopLevelNodeModulesFolders(rootDir);
49+
50+
// Define root entry points
51+
const rootEntryPoints = [build.resolvePath('src/setup_node_env/index.js')];
52+
53+
// Creates the static filesystem with
54+
// every node_module we have
55+
const staticFsAddedPaths = await generateStaticFsVolume(
56+
rootDir,
57+
nodeModulesFolders,
58+
rootEntryPoints
59+
);
60+
61+
// Delete node_modules folder
62+
await deletePathsList(staticFsAddedPaths);
63+
},
64+
};

‎src/dev/build/tasks/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export * from './create_archives_task';
2525
export * from './create_empty_dirs_and_files_task';
2626
export * from './create_package_json_task';
2727
export * from './create_readme_task';
28+
export * from './create_static_fs_with_node_modules_task';
2829
export * from './install_dependencies_task';
2930
export * from './license_file_task';
3031
export * from './nodejs';

0 commit comments

Comments
 (0)