Skip to content

Commit 2c41f58

Browse files
ymao1ymao1
committed
Merge branch 'master' of https://github.com/elastic/kibana into alerting/feature-privilege-test
2 parents 9983a91 + bf4b6d2 commit 2c41f58

File tree

357 files changed

+1184539
-241711
lines changed

Some content is hidden

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

357 files changed

+1184539
-241711
lines changed

‎docs/developer/getting-started/monorepo-packages.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ yarn kbn watch-bazel
6363

6464
- @elastic/datemath
6565
- @kbn/apm-utils
66+
- @kbn/babel-code-parser
6667
- @kbn/babel-preset
6768
- @kbn/config-schema
6869
- @kbn/std

‎docs/developer/plugin-list.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ Failure to have auth enabled in Kibana will make for a broken UI. UI-based error
343343
344344
|{kib-repo}blob/{branch}/x-pack/plugins/cloud/README.md[cloud]
345345
|The cloud plugin adds cloud specific features to Kibana.
346+
The client-side plugin configures following values:
346347
347348
348349
|{kib-repo}blob/{branch}/x-pack/plugins/console_extensions/README.md[consoleExtensions]

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"dependencies": {
9898
"@elastic/apm-rum": "^5.6.1",
9999
"@elastic/apm-rum-react": "^1.2.5",
100-
"@elastic/charts": "28.2.0",
100+
"@elastic/charts": "29.0.0",
101101
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
102102
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
103103
"@elastic/ems-client": "7.13.0",
@@ -437,7 +437,7 @@
437437
"@elastic/makelogs": "^6.0.0",
438438
"@istanbuljs/schema": "^0.1.2",
439439
"@jest/reporters": "^26.6.2",
440-
"@kbn/babel-code-parser": "link:packages/kbn-babel-code-parser",
440+
"@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser/npm_module",
441441
"@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset/npm_module",
442442
"@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
443443
"@kbn/dev-utils": "link:packages/kbn-dev-utils",

‎packages/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ filegroup(
55
srcs = [
66
"//packages/elastic-datemath:build",
77
"//packages/kbn-apm-utils:build",
8+
"//packages/kbn-babel-code-parser:build",
89
"//packages/kbn-babel-preset:build",
910
"//packages/kbn-config-schema:build",
1011
"//packages/kbn-std:build",

‎packages/elastic-datemath/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,14 @@ ts_project(
5454

5555
js_library(
5656
name = PKG_BASE_NAME,
57-
srcs = [],
57+
srcs = NPM_MODULE_EXTRA_FILES,
5858
deps = [":tsc"] + DEPS,
5959
package_name = PKG_REQUIRE_NAME,
6060
visibility = ["//visibility:public"],
6161
)
6262

6363
pkg_npm(
6464
name = "npm_module",
65-
srcs = NPM_MODULE_EXTRA_FILES,
6665
deps = [
6766
":%s" % PKG_BASE_NAME,
6867
]

‎packages/kbn-apm-utils/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,14 @@ ts_project(
5353

5454
js_library(
5555
name = PKG_BASE_NAME,
56-
srcs = [],
56+
srcs = NPM_MODULE_EXTRA_FILES,
5757
deps = [":tsc"] + DEPS,
5858
package_name = PKG_REQUIRE_NAME,
5959
visibility = ["//visibility:public"],
6060
)
6161

6262
pkg_npm(
6363
name = "npm_module",
64-
srcs = NPM_MODULE_EXTRA_FILES,
6564
deps = [
6665
":%s" % PKG_BASE_NAME,
6766
]

‎packages/kbn-babel-code-parser/BUILD.bazel‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
2+
load("@npm//@babel/cli:index.bzl", "babel")
3+
4+
PKG_BASE_NAME = "kbn-babel-code-parser"
5+
PKG_REQUIRE_NAME = "@kbn/babel-code-parser"
6+
7+
SOURCE_FILES = glob(
8+
[
9+
"src/**/*",
10+
],
11+
exclude = [
12+
"**/*.test.*"
13+
],
14+
)
15+
16+
SRCS = SOURCE_FILES
17+
18+
filegroup(
19+
name = "srcs",
20+
srcs = SRCS,
21+
)
22+
23+
NPM_MODULE_EXTRA_FILES = [
24+
"package.json",
25+
"README.md",
26+
]
27+
28+
DEPS = [
29+
"//packages/kbn-babel-preset",
30+
"@npm//@babel/parser",
31+
"@npm//@babel/traverse",
32+
"@npm//lodash",
33+
]
34+
35+
babel(
36+
name = "target",
37+
data = [
38+
":srcs",
39+
".babelrc",
40+
] + DEPS,
41+
output_dir = True,
42+
args = [
43+
"./%s/src" % package_name(),
44+
"--out-dir",
45+
"$(@D)",
46+
"--quiet"
47+
],
48+
)
49+
50+
js_library(
51+
name = PKG_BASE_NAME,
52+
srcs = NPM_MODULE_EXTRA_FILES,
53+
deps = [":target"] + DEPS,
54+
package_name = PKG_REQUIRE_NAME,
55+
visibility = ["//visibility:public"],
56+
)
57+
58+
pkg_npm(
59+
name = "npm_module",
60+
deps = [
61+
":%s" % PKG_BASE_NAME,
62+
]
63+
)
64+
65+
filegroup(
66+
name = "build",
67+
srcs = [
68+
":npm_module",
69+
],
70+
visibility = ["//visibility:public"],
71+
)

‎packages/kbn-babel-code-parser/package.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,5 @@
88
"repository": {
99
"type": "git",
1010
"url": "https://github.com/elastic/kibana/tree/master/packages/kbn-babel-code-parser"
11-
},
12-
"scripts": {
13-
"build": "../../node_modules/.bin/babel src --out-dir target",
14-
"kbn:bootstrap": "yarn build --quiet",
15-
"kbn:watch": "yarn build --watch"
1611
}
1712
}

‎packages/kbn-babel-preset/BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ DEPS = [
3838

3939
js_library(
4040
name = PKG_BASE_NAME,
41-
srcs = [
41+
srcs = NPM_MODULE_EXTRA_FILES + [
4242
":srcs",
4343
],
4444
deps = DEPS,
@@ -48,7 +48,6 @@ js_library(
4848

4949
pkg_npm(
5050
name = "npm_module",
51-
srcs = NPM_MODULE_EXTRA_FILES,
5251
deps = [
5352
":%s" % PKG_BASE_NAME,
5453
]

‎packages/kbn-optimizer/limits.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pageLoadAssetSize:
99
charts: 195358
1010
cloud: 21076
1111
console: 46091
12-
core: 413500
12+
core: 414000
1313
crossClusterReplication: 65408
1414
dashboard: 374194
1515
dashboardEnhanced: 65646

0 commit comments

Comments
 (0)