Skip to content

Commit f27f49c

Browse files
Merge branch 'master' into Add_A11y_Tests_To_Upgrade_Assistant
2 parents 42faf22 + b413d9d commit f27f49c

File tree

28,008 files changed

+111208
-82385
lines changed

Some content is hidden

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

28,008 files changed

+111208
-82385
lines changed

.bazelignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
.idea
99
.teamcity
1010
.yarn-local-mirror
11-
bazel-cache
12-
bazel-dist
11+
/bazel
1312
build
1413
node_modules
1514
target

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Inspired on from https://raw.githubusercontent.com/bazelbuild/rules_nodejs/master/.bazelrc
1+
# Inspired by https://raw.githubusercontent.com/bazelbuild/rules_nodejs/master/.bazelrc
22
# Import shared settings first so we can override below
33
import %workspace%/.bazelrc.common
44

.bazelrc.common

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@
55
#
66
# The full list of Bazel options: https://docs.bazel.build/versions/master/command-line-reference.html
77

8-
# Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
9-
build --disk_cache=bazel-cache/disk-cache
8+
# Local Cache Settings
9+
## Avoid cache results from being corrupt when changing source during build
10+
common --experimental_guard_against_concurrent_changes
1011

11-
# Bazel repo cache settings
12-
build --repository_cache=bazel-cache/repository-cache
12+
## Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
13+
build --disk_cache=~/.bazel-cache/disk-cache
14+
15+
## Bazel repo cache settings
16+
build --repository_cache=~/.bazel-cache/repository-cache
1317

1418
# Bazel will create symlinks from the workspace directory to output artifacts.
15-
# Build results will be placed in a directory called "bazel-dist/bin"
19+
# Build results will be placed in a directory called "bazel/bin"
1620
# This will still create a bazel-out symlink in
1721
# the project directory, which must be excluded from the
1822
# editor's search path.
19-
build --symlink_prefix=bazel-dist/
23+
build --symlink_prefix=bazel/
2024
# To disable the symlinks altogether (including bazel-out) we can use
2125
# build --symlink_prefix=/
2226
# however this makes it harder to find outputs.
@@ -37,9 +41,7 @@ common --color=yes
3741
build --show_task_finish
3842
build --noshow_progress
3943
build --noshow_loading_progress
40-
41-
## enforced default values
42-
build --show_result=1
44+
build --show_result=0
4345

4446
# Specifies desired output mode for running tests.
4547
# Valid values are
@@ -78,7 +80,8 @@ test:debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999
7880
# The node process will break before user code starts and wait for the debugger to connect.
7981
run:debug --define=VERBOSE_LOGS=1 -- --node_options=--inspect-brk
8082
# The following option will change the build output of certain rules such as terser and may not be desirable in all cases
81-
build:debug --compilation_mode=dbg
83+
# It will also output both the repo cache and action cache to a folder inside the repo
84+
build:debug --compilation_mode=dbg --show_result=1 --disk_cache=bazel/disk-cache --repository_cache=bazel/repository-cache
8285

8386
# Turn off legacy external runfiles
8487
# This prevents accidentally depending on this feature, which Bazel will remove.

.eslintignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ snapshots.js
4646
/packages/kbn-monaco/src/painless/antlr
4747

4848
# Bazel
49-
/bazel-*
49+
/bazel

.eslintrc.js

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
const APACHE_2_0_LICENSE_HEADER = `
@@ -27,7 +27,7 @@ const APACHE_2_0_LICENSE_HEADER = `
2727
*/
2828
`;
2929

30-
const DUAL_LICENSE_HEADER = `
30+
const OLD_DUAL_LICENSE_HEADER = `
3131
/*
3232
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3333
* or more contributor license agreements. Licensed under the Elastic License
@@ -37,14 +37,33 @@ const DUAL_LICENSE_HEADER = `
3737
*/
3838
`;
3939

40-
const ELASTIC_LICENSE_HEADER = `
40+
const DUAL_LICENSE_HEADER = `
41+
/*
42+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
43+
* or more contributor license agreements. Licensed under the Elastic License
44+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
45+
* in compliance with, at your election, the Elastic License 2.0 or the Server
46+
* Side Public License, v 1.
47+
*/
48+
`;
49+
50+
const OLD_ELASTIC_LICENSE_HEADER = `
4151
/*
4252
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
4353
* or more contributor license agreements. Licensed under the Elastic License;
4454
* you may not use this file except in compliance with the Elastic License.
4555
*/
4656
`;
4757

58+
const ELASTIC_LICENSE_HEADER = `
59+
/*
60+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
61+
* or more contributor license agreements. Licensed under the Elastic License
62+
* 2.0; you may not use this file except in compliance with the Elastic License
63+
* 2.0.
64+
*/
65+
`;
66+
4867
const SAFER_LODASH_SET_HEADER = `
4968
/*
5069
* Elasticsearch B.V licenses this file to you under the MIT License.
@@ -136,6 +155,8 @@ module.exports = {
136155
licenses: [
137156
APACHE_2_0_LICENSE_HEADER,
138157
ELASTIC_LICENSE_HEADER,
158+
OLD_DUAL_LICENSE_HEADER,
159+
OLD_ELASTIC_LICENSE_HEADER,
139160
SAFER_LODASH_SET_HEADER,
140161
SAFER_LODASH_SET_LODASH_HEADER,
141162
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -166,6 +187,8 @@ module.exports = {
166187
licenses: [
167188
DUAL_LICENSE_HEADER,
168189
ELASTIC_LICENSE_HEADER,
190+
OLD_DUAL_LICENSE_HEADER,
191+
OLD_ELASTIC_LICENSE_HEADER,
169192
SAFER_LODASH_SET_HEADER,
170193
SAFER_LODASH_SET_LODASH_HEADER,
171194
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -201,8 +224,10 @@ module.exports = {
201224
'error',
202225
{
203226
licenses: [
204-
DUAL_LICENSE_HEADER,
205227
APACHE_2_0_LICENSE_HEADER,
228+
DUAL_LICENSE_HEADER,
229+
OLD_DUAL_LICENSE_HEADER,
230+
OLD_ELASTIC_LICENSE_HEADER,
206231
SAFER_LODASH_SET_HEADER,
207232
SAFER_LODASH_SET_LODASH_HEADER,
208233
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -228,9 +253,11 @@ module.exports = {
228253
'error',
229254
{
230255
licenses: [
256+
APACHE_2_0_LICENSE_HEADER,
231257
DUAL_LICENSE_HEADER,
232258
ELASTIC_LICENSE_HEADER,
233-
APACHE_2_0_LICENSE_HEADER,
259+
OLD_DUAL_LICENSE_HEADER,
260+
OLD_ELASTIC_LICENSE_HEADER,
234261
SAFER_LODASH_SET_HEADER,
235262
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
236263
],
@@ -251,9 +278,11 @@ module.exports = {
251278
'error',
252279
{
253280
licenses: [
281+
APACHE_2_0_LICENSE_HEADER,
254282
DUAL_LICENSE_HEADER,
255283
ELASTIC_LICENSE_HEADER,
256-
APACHE_2_0_LICENSE_HEADER,
284+
OLD_DUAL_LICENSE_HEADER,
285+
OLD_ELASTIC_LICENSE_HEADER,
257286
SAFER_LODASH_SET_LODASH_HEADER,
258287
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
259288
],
@@ -274,9 +303,11 @@ module.exports = {
274303
'error',
275304
{
276305
licenses: [
306+
APACHE_2_0_LICENSE_HEADER,
277307
DUAL_LICENSE_HEADER,
278308
ELASTIC_LICENSE_HEADER,
279-
APACHE_2_0_LICENSE_HEADER,
309+
OLD_ELASTIC_LICENSE_HEADER,
310+
OLD_DUAL_LICENSE_HEADER,
280311
SAFER_LODASH_SET_HEADER,
281312
SAFER_LODASH_SET_LODASH_HEADER,
282313
],

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ report.asciidoc
7878
.yarn-local-mirror
7979

8080
# Bazel
81-
/bazel-*
81+
/bazel
8282
/.bazelrc.user

BUILD.bazel

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
exports_files(
2+
[
3+
"tsconfig.json",
4+
"package.json"
5+
],
6+
visibility = ["//visibility:public"]
7+
)

Gruntfile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
require('./src/setup_node_env');

LICENSE.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source code in this repository is covered by (i) a dual license under the Server
2-
Side Public License, v 1 and the Elastic License or (ii) an Apache License 2.0
3-
compatible license or (iii) solely under the Elastic License, in each case, as
4-
noted in the applicable header. The default throughout the repository is a dual
5-
license under the Server Side Public License, v 1 and the Elastic License,
6-
unless the header specifies another license. Code that is licensed solely under
7-
the Elastic License is found only in the x-pack folder.
2+
Side Public License, v 1 and the Elastic License 2.0 or (ii) an Apache License
3+
2.0 compatible license or (iii) solely under the Elastic License 2.0, in each
4+
case, as noted in the applicable header. The default throughout the repository
5+
is a dual license under the Server Side Public License, v 1 and the Elastic
6+
License 2.0, unless the header specifies another license. Code that is licensed
7+
solely under the Elastic License 2.0 is found only in the x-pack folder.

docs/developer/plugin-list.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ the infrastructure monitoring use-case within Kibana.
419419
420420
421421
|{kib-repo}blob/{branch}/x-pack/plugins/lens/readme.md[lens]
422-
|Run all tests from the x-pack root directory
422+
|Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads.
423423
424424
425425
|{kib-repo}blob/{branch}/x-pack/plugins/license_management/README.md[licenseManagement]

0 commit comments

Comments
 (0)