Skip to content

Commit 1a81db3

Browse files
committed
Merge branch 'master' of github.com:elastic/kibana into implement/root-test-ts-project
2 parents 2dc884c + e4f7447 commit 1a81db3

File tree

122 files changed

+3335
-1939
lines changed

Some content is hidden

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

122 files changed

+3335
-1939
lines changed

docs/settings/fleet-settings.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
3939
|===
4040
| `xpack.fleet.agents.fleet_server.hosts`
4141
| Hostnames used by {agent} for accessing {fleet-server}.
42-
| `xpack.fleet.agents.elasticsearch.host`
43-
| The hostname used by {agent} for accessing {es}.
42+
| `xpack.fleet.agents.elasticsearch.hosts`
43+
| Hostnames used by {agent} for accessing {es}.
4444
|===
4545

4646
[NOTE]

package.json

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"@elastic/apm-rum": "^5.6.1",
101101
"@elastic/apm-rum-react": "^1.2.5",
102102
"@elastic/charts": "29.2.0",
103-
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
103+
"@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
104104
"@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
105105
"@elastic/ems-client": "7.13.0",
106106
"@elastic/eui": "33.0.0",
@@ -111,7 +111,7 @@
111111
"@elastic/numeral": "^2.5.1",
112112
"@elastic/react-search-ui": "^1.5.1",
113113
"@elastic/request-crypto": "1.1.4",
114-
"@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set/npm_module",
114+
"@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
115115
"@elastic/search-ui-app-search-connector": "^1.5.0",
116116
"@elastic/ui-ace": "0.2.3",
117117
"@hapi/accept": "^5.0.2",
@@ -124,39 +124,39 @@
124124
"@hapi/inert": "^6.0.3",
125125
"@hapi/podium": "^4.1.1",
126126
"@hapi/wreck": "^17.1.0",
127-
"@kbn/ace": "link:bazel-bin/packages/kbn-ace/npm_module",
128-
"@kbn/analytics": "link:bazel-bin/packages/kbn-analytics/npm_module",
129-
"@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader/npm_module",
130-
"@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module",
131-
"@kbn/config": "link:bazel-bin/packages/kbn-config/npm_module",
132-
"@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module",
133-
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto/npm_module",
134-
"@kbn/i18n": "link:bazel-bin/packages/kbn-i18n/npm_module",
127+
"@kbn/ace": "link:bazel-bin/packages/kbn-ace",
128+
"@kbn/analytics": "link:bazel-bin/packages/kbn-analytics",
129+
"@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader",
130+
"@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils",
131+
"@kbn/config": "link:bazel-bin/packages/kbn-config",
132+
"@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema",
133+
"@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
134+
"@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
135+
"@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
135136
"@kbn/interpreter": "link:packages/kbn-interpreter",
136-
"@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module",
137-
"@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging/npm_module",
138-
"@kbn/logging": "link:bazel-bin/packages/kbn-logging/npm_module",
139-
"@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module",
140-
"@kbn/monaco": "link:bazel-bin/packages/kbn-monaco/npm_module",
137+
"@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils",
138+
"@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging",
139+
"@kbn/logging": "link:bazel-bin/packages/kbn-logging",
140+
"@kbn/monaco": "link:bazel-bin/packages/kbn-monaco",
141141
"@kbn/rule-data-utils": "link:packages/kbn-rule-data-utils",
142-
"@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils/npm_module",
143-
"@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types/npm_module",
144-
"@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types/npm_module",
145-
"@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types/npm_module",
146-
"@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils/npm_module",
147-
"@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api/npm_module",
148-
"@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants/npm_module",
149-
"@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks/npm_module",
150-
"@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils/npm_module",
151-
"@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module",
152-
"@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools/npm_module",
142+
"@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants",
143+
"@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils",
144+
"@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types",
145+
"@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types",
146+
"@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types",
147+
"@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils",
148+
"@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api",
149+
"@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks",
150+
"@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils",
151+
"@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils",
152+
"@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools",
153153
"@kbn/server-route-repository": "link:packages/kbn-server-route-repository",
154-
"@kbn/std": "link:bazel-bin/packages/kbn-std/npm_module",
155-
"@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath/npm_module",
154+
"@kbn/std": "link:bazel-bin/packages/kbn-std",
155+
"@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath",
156156
"@kbn/ui-framework": "link:packages/kbn-ui-framework",
157157
"@kbn/ui-shared-deps": "link:packages/kbn-ui-shared-deps",
158-
"@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module",
159-
"@kbn/utils": "link:bazel-bin/packages/kbn-utils/npm_module",
158+
"@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types",
159+
"@kbn/utils": "link:bazel-bin/packages/kbn-utils",
160160
"@loaders.gl/core": "^2.3.1",
161161
"@loaders.gl/json": "^2.3.1",
162162
"@mapbox/geojson-rewind": "^0.5.0",
@@ -241,7 +241,6 @@
241241
"get-port": "^5.0.0",
242242
"getopts": "^2.2.5",
243243
"getos": "^3.1.0",
244-
"git-url-parse": "11.1.2",
245244
"github-markdown-css": "^2.10.0",
246245
"glob": "^7.1.2",
247246
"glob-all": "^3.2.1",
@@ -294,7 +293,7 @@
294293
"memoize-one": "^5.0.0",
295294
"mime": "^2.4.4",
296295
"mime-types": "^2.1.27",
297-
"mini-css-extract-plugin": "0.8.0",
296+
"mini-css-extract-plugin": "1.1.0",
298297
"minimatch": "^3.0.4",
299298
"moment": "^2.24.0",
300299
"moment-duration-format": "^2.3.2",
@@ -447,28 +446,28 @@
447446
"@cypress/webpack-preprocessor": "^5.6.0",
448447
"@elastic/apm-rum": "^5.6.1",
449448
"@elastic/apm-rum-react": "^1.2.5",
450-
"@elastic/eslint-config-kibana": "link:bazel-bin/packages/elastic-eslint-config-kibana/npm_module",
449+
"@elastic/eslint-config-kibana": "link:bazel-bin/packages/elastic-eslint-config-kibana",
451450
"@elastic/eslint-plugin-eui": "0.0.2",
452451
"@elastic/github-checks-reporter": "0.0.20b3",
453452
"@elastic/makelogs": "^6.0.0",
454453
"@istanbuljs/schema": "^0.1.2",
455454
"@jest/reporters": "^26.6.2",
456-
"@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser/npm_module",
457-
"@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset/npm_module",
455+
"@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
456+
"@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
458457
"@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
459-
"@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils/npm_module",
460-
"@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module",
461-
"@kbn/es": "link:bazel-bin/packages/kbn-es/npm_module",
458+
"@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils",
459+
"@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
460+
"@kbn/es": "link:bazel-bin/packages/kbn-es",
462461
"@kbn/es-archiver": "link:packages/kbn-es-archiver",
463-
"@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana/npm_module",
464-
"@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint/npm_module",
465-
"@kbn/expect": "link:bazel-bin/packages/kbn-expect/npm_module",
462+
"@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana",
463+
"@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
464+
"@kbn/expect": "link:bazel-bin/packages/kbn-expect",
466465
"@kbn/optimizer": "link:packages/kbn-optimizer",
467-
"@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator/npm_module",
466+
"@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator",
468467
"@kbn/plugin-helpers": "link:packages/kbn-plugin-helpers",
469468
"@kbn/pm": "link:packages/kbn-pm",
470469
"@kbn/storybook": "link:packages/kbn-storybook",
471-
"@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module",
470+
"@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools",
472471
"@kbn/test": "link:packages/kbn-test",
473472
"@kbn/test-subj-selector": "link:packages/kbn-test-subj-selector",
474473
"@loaders.gl/polyfills": "^2.3.5",
@@ -533,7 +532,6 @@
533532
"@types/geojson": "7946.0.7",
534533
"@types/getopts": "^2.0.1",
535534
"@types/getos": "^3.0.0",
536-
"@types/git-url-parse": "^9.0.0",
537535
"@types/glob": "^7.1.2",
538536
"@types/gulp": "^4.0.6",
539537
"@types/gulp-zip": "^4.0.1",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ DEPS = [
3434

3535
babel(
3636
name = "target",
37-
data = [
37+
data = DEPS + [
3838
":srcs",
3939
".babelrc",
40-
] + DEPS,
40+
],
4141
output_dir = True,
4242
# the following arg paths includes $(execpath) as babel runs on the sandbox root
4343
args = [

packages/kbn-es/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ DEPS = [
4747

4848
babel(
4949
name = "target",
50-
data = [
50+
data = DEPS + [
5151
":srcs",
5252
".babelrc",
53-
] + DEPS,
53+
],
5454
output_dir = True,
5555
# the following arg paths includes $(execpath) as babel runs on the sandbox root
5656
args = [

packages/kbn-expect/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_REQUIRE_NAME = "@kbn/expect"
55

66
SOURCE_FILES = glob([
77
"expect.js",
8-
"expect.js.d.ts",
8+
"expect.d.ts",
99
])
1010

1111
SRCS = SOURCE_FILES
File renamed without changes.

packages/kbn-expect/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@kbn/expect",
33
"main": "./expect.js",
4+
"typings": "./expect.d.ts",
45
"version": "1.0.0",
56
"license": "MIT",
67
"private": true,

packages/kbn-expect/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"incremental": false,
55
},
66
"include": [
7-
"expect.js.d.ts"
7+
"expect.d.ts"
88
]
99
}

packages/kbn-monaco/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ webpack(
4848
name = "target_web",
4949
data = DEPS + [
5050
":src",
51-
":webpack.config.js",
51+
"webpack.config.js",
5252
],
5353
output_dir = True,
5454
args = [
@@ -87,7 +87,7 @@ ts_project(
8787
js_library(
8888
name = PKG_BASE_NAME,
8989
srcs = NPM_MODULE_EXTRA_FILES,
90-
deps = DEPS + [":target_web", ":tsc"],
90+
deps = DEPS + [":tsc", ":target_web"],
9191
package_name = PKG_REQUIRE_NAME,
9292
visibility = ["//visibility:public"],
9393
)

packages/kbn-monaco/webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const createLangWorkerConfig = (lang) => {
2222
filename: `${lang}.editor.worker.js`,
2323
},
2424
resolve: {
25-
modules: ['node_modules'],
2625
extensions: ['.js', '.ts', '.tsx'],
2726
},
2827
stats: 'errors-only',

0 commit comments

Comments
 (0)