Skip to content

Commit b40d3cf

Browse files
kibanamachinekibanamachine
authored
Merge branch 'master' into feature-105603-set-default-settings-in-component-template
2 parents e352d7e + 7c4e4f5 commit b40d3cf

97 files changed

Lines changed: 240 additions & 405 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.

‎docs/settings/logging-settings.asciidoc‎

Lines changed: 20 additions & 8 deletions

‎packages/elastic-datemath/.babelrc‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/kbn-ace/.babelrc‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎packages/kbn-ace/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jsts_transpiler(
4545
srcs = SRCS,
4646
additional_args = [
4747
"--copy-files",
48+
"--ignore",
49+
"**/*/src/ace/modes/x_json/worker/x_json.ace.worker.js",
4850
"--quiet"
4951
],
5052
build_pkg_name = package_name(),

‎packages/kbn-alerts/.babelrc‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/kbn-alerts/.babelrc.browser‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎packages/kbn-alerts/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jsts_transpiler(
5757
name = "target_web",
5858
srcs = SRCS,
5959
build_pkg_name = package_name(),
60-
config_file = ".babelrc.browser"
60+
web = True,
6161
)
6262

6363
ts_config(

‎packages/kbn-analytics/.babelrc‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/kbn-analytics/.babelrc.browser‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎packages/kbn-analytics/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jsts_transpiler(
4242
name = "target_web",
4343
srcs = SRCS,
4444
build_pkg_name = package_name(),
45-
config_file = ".babelrc.browser"
45+
web = True,
4646
)
4747

4848
ts_config(

0 commit comments

Comments
 (0)