Skip to content

Commit

Permalink
Merge branch 'main' into cft-purge-deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
jbudz authored Jul 19, 2022
2 parents f2f7aab + b31b076 commit 743c2ba
Show file tree
Hide file tree
Showing 271 changed files with 3,746 additions and 1,919 deletions.
10 changes: 6 additions & 4 deletions .buildkite/pull_requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@
"^src/dev/prs/kibana_qa_pr_list\\.json$",
"^\\.buildkite/pull_requests\\.json$"
],
"always_require_ci_on_changed": [
"^docs/developer/plugin-list.asciidoc$"
],
"kibana_versions_check": true
"always_require_ci_on_changed": ["^docs/developer/plugin-list.asciidoc$"],
"kibana_versions_check": true,
"kibana_build_reuse": true,
"kibana_build_reuse_pipeline_slugs": ["kibana-pull-request", "kibana-on-merge"],
"kibana_build_reuse_regexes": ["^test/", "^x-pack/test/"],
"kibana_build_reuse_label": "ci:reuse-kibana-build"
}
]
}
6 changes: 3 additions & 3 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
on:
pull_request_target:
branches: ["main"]
types: ["labeled", "closed"]
branches: ['main']
types: ['labeled', 'closed']

jobs:
backport:
Expand All @@ -16,7 +16,7 @@ jobs:
)
steps:
- name: Backport Action
uses: sqren/backport-github-action@v8.8.0
uses: sqren/backport-github-action@v8.9.2
with:
github_token: ${{secrets.KIBANAMACHINE_TOKEN}}

Expand Down
2 changes: 2 additions & 0 deletions dev_docs/operations/operations_landing.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ layout: landing
{ pageId: "kibDevDocsOpsEslintConfig" },
{ pageId: "kibDevDocsOpsEslintWithTypes" },
{ pageId: "kibDevDocsOpsEslintPluginImports" },
{ pageId: "kibDevDocsOpsEslintPluginDisable" },
{ pageId: "kibDevDocsOpsKbnYarnLockValidator"},
]}
/>

Expand Down
3 changes: 3 additions & 0 deletions docs/management/advanced-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,9 @@ When enabled, removes the columns that are not in the new data view.
[[discover-sample-size]]`discover:sampleSize`::
Specifies the number of rows to display in the *Discover* table.

[[discover-sampleRowsPerPage]]`discover:sampleRowsPerPage`::
Specifies the number of rows to display per page in the *Discover* table.

[[discover-searchFieldsFromSource]]`discover:searchFieldsFromSource`::
Load fields from the original JSON {ref}/mapping-source-field.html[`_source`].
When disabled, *Discover* loads fields using the {es} search API's
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { CountUntil } from '../../../../components/count_until';
import { Page } from '../../../../components/page';
import { useDeps } from '../../../../hooks/use_deps';

// eslint-disable-next-line
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface Props {}

export const PageCountUntil: React.FC<Props> = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { DoubleIntegers } from '../../../../components/double_integers';
import { Page } from '../../../../components/page';
import { useDeps } from '../../../../hooks/use_deps';

// eslint-disable-next-line
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface Props {}

export const PageDoubleIntegers: React.FC<Props> = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { EuiPageSideBar, EuiSideNav } from '@elastic/eui';
import { useHistory } from 'react-router-dom';
import { routes } from '../../../routes';

// eslint-disable-next-line
// eslint-disable-next-line @typescript-eslint/no-empty-interface
interface SidebarProps {}

export const Sidebar: React.FC<SidebarProps> = () => {
Expand Down
2 changes: 1 addition & 1 deletion examples/response_stream/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface ResponseStreamSetupPlugins {
developerExamples: DeveloperExamplesSetup;
}

// eslint-disable-next-line
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface ResponseStreamStartPlugins {}

export class ResponseStreamPlugin implements Plugin {
Expand Down
4 changes: 2 additions & 2 deletions examples/response_stream/server/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import type { DataRequestHandlerContext } from '@kbn/data-plugin/server';

import { defineReducerStreamRoute, defineSimpleStringStreamRoute } from './routes';

// eslint-disable-next-line
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface ResponseStreamSetupPlugins {}

// eslint-disable-next-line
// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface ResponseStreamStartPlugins {}

export class ResponseStreamPlugin implements Plugin {
Expand Down
3 changes: 3 additions & 0 deletions nav-kibana-dev.docnav.json
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,9 @@
{
"id": "kibDevDocsOpsEslintPluginImports"
},
{
"id": "kibDevDocsOpsEslintPluginDisable"
},
{
"id": "kibDevDocsOpsKbnYarnLockValidator"
}
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@
"@kbn/core-injected-metadata-browser-internal": "link:bazel-bin/packages/core/injected-metadata/core-injected-metadata-browser-internal",
"@kbn/core-injected-metadata-browser-mocks": "link:bazel-bin/packages/core/injected-metadata/core-injected-metadata-browser-mocks",
"@kbn/core-injected-metadata-common-internal": "link:bazel-bin/packages/core/injected-metadata/core-injected-metadata-common-internal",
"@kbn/core-integrations-browser-internal": "link:bazel-bin/packages/core/integrations/core-integrations-browser-internal",
"@kbn/core-integrations-browser-mocks": "link:bazel-bin/packages/core/integrations/core-integrations-browser-mocks",
"@kbn/core-logging-server": "link:bazel-bin/packages/core/logging/core-logging-server",
"@kbn/core-logging-server-internal": "link:bazel-bin/packages/core/logging/core-logging-server-internal",
"@kbn/core-logging-server-mocks": "link:bazel-bin/packages/core/logging/core-logging-server-mocks",
Expand All @@ -222,6 +224,7 @@
"@kbn/doc-links": "link:bazel-bin/packages/kbn-doc-links",
"@kbn/es-errors": "link:bazel-bin/packages/kbn-es-errors",
"@kbn/es-query": "link:bazel-bin/packages/kbn-es-query",
"@kbn/eslint-plugin-disable": "link:bazel-bin/packages/kbn-eslint-plugin-disable",
"@kbn/eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports",
"@kbn/field-types": "link:bazel-bin/packages/kbn-field-types",
"@kbn/flot-charts": "link:bazel-bin/packages/kbn-flot-charts",
Expand Down Expand Up @@ -785,6 +788,8 @@
"@types/kbn__core-injected-metadata-browser-internal": "link:bazel-bin/packages/core/injected-metadata/core-injected-metadata-browser-internal/npm_module_types",
"@types/kbn__core-injected-metadata-browser-mocks": "link:bazel-bin/packages/core/injected-metadata/core-injected-metadata-browser-mocks/npm_module_types",
"@types/kbn__core-injected-metadata-common-internal": "link:bazel-bin/packages/core/injected-metadata/core-injected-metadata-common-internal/npm_module_types",
"@types/kbn__core-integrations-browser-internal": "link:bazel-bin/packages/core/integrations/core-integrations-browser-internal/npm_module_types",
"@types/kbn__core-integrations-browser-mocks": "link:bazel-bin/packages/core/integrations/core-integrations-browser-mocks/npm_module_types",
"@types/kbn__core-logging-server": "link:bazel-bin/packages/core/logging/core-logging-server/npm_module_types",
"@types/kbn__core-logging-server-internal": "link:bazel-bin/packages/core/logging/core-logging-server-internal/npm_module_types",
"@types/kbn__core-logging-server-mocks": "link:bazel-bin/packages/core/logging/core-logging-server-mocks/npm_module_types",
Expand Down Expand Up @@ -816,6 +821,7 @@
"@types/kbn__es-archiver": "link:bazel-bin/packages/kbn-es-archiver/npm_module_types",
"@types/kbn__es-errors": "link:bazel-bin/packages/kbn-es-errors/npm_module_types",
"@types/kbn__es-query": "link:bazel-bin/packages/kbn-es-query/npm_module_types",
"@types/kbn__eslint-plugin-disable": "link:bazel-bin/packages/kbn-eslint-plugin-disable/npm_module_types",
"@types/kbn__eslint-plugin-imports": "link:bazel-bin/packages/kbn-eslint-plugin-imports/npm_module_types",
"@types/kbn__field-types": "link:bazel-bin/packages/kbn-field-types/npm_module_types",
"@types/kbn__find-used-node-modules": "link:bazel-bin/packages/kbn-find-used-node-modules/npm_module_types",
Expand Down Expand Up @@ -1003,7 +1009,7 @@
"babel-plugin-require-context-hook": "^1.0.0",
"babel-plugin-styled-components": "^2.0.7",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"backport": "^8.8.0",
"backport": "^8.9.2",
"callsites": "^3.1.0",
"chance": "1.0.18",
"chokidar": "^3.4.3",
Expand Down
6 changes: 6 additions & 0 deletions packages/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ filegroup(
"//packages/core/injected-metadata/core-injected-metadata-browser-mocks:build",
"//packages/core/injected-metadata/core-injected-metadata-browser:build",
"//packages/core/injected-metadata/core-injected-metadata-common-internal:build",
"//packages/core/integrations/core-integrations-browser-internal:build",
"//packages/core/integrations/core-integrations-browser-mocks:build",
"//packages/core/logging/core-logging-server-internal:build",
"//packages/core/logging/core-logging-server-mocks:build",
"//packages/core/logging/core-logging-server:build",
Expand Down Expand Up @@ -121,6 +123,7 @@ filegroup(
"//packages/kbn-es-query:build",
"//packages/kbn-es:build",
"//packages/kbn-eslint-config:build",
"//packages/kbn-eslint-plugin-disable:build",
"//packages/kbn-eslint-plugin-eslint:build",
"//packages/kbn-eslint-plugin-imports:build",
"//packages/kbn-expect:build",
Expand Down Expand Up @@ -275,6 +278,8 @@ filegroup(
"//packages/core/injected-metadata/core-injected-metadata-browser-mocks:build_types",
"//packages/core/injected-metadata/core-injected-metadata-browser:build_types",
"//packages/core/injected-metadata/core-injected-metadata-common-internal:build_types",
"//packages/core/integrations/core-integrations-browser-internal:build_types",
"//packages/core/integrations/core-integrations-browser-mocks:build_types",
"//packages/core/logging/core-logging-server-internal:build_types",
"//packages/core/logging/core-logging-server-mocks:build_types",
"//packages/core/logging/core-logging-server:build_types",
Expand Down Expand Up @@ -323,6 +328,7 @@ filegroup(
"//packages/kbn-es-archiver:build_types",
"//packages/kbn-es-errors:build_types",
"//packages/kbn-es-query:build_types",
"//packages/kbn-eslint-plugin-disable:build_types",
"//packages/kbn-eslint-plugin-imports:build_types",
"//packages/kbn-field-types:build_types",
"//packages/kbn-find-used-node-modules:build_types",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/shippers/fullstory/src/load_snippet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function loadSnippet({
window._fs_org = fullStoryOrgId;
window._fs_namespace = namespace;

/* eslint-disable */
/* eslint-disable dot-notation,prettier/prettier,@typescript-eslint/no-shadow,prefer-rest-params,@typescript-eslint/no-unused-expressions */
(function(m,n,e,t,l,o,g,y){
if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
// @ts-expect-error
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
load("@npm//@bazel/typescript:index.bzl", "ts_config")
load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
load("//src/dev/bazel:index.bzl", "jsts_transpiler", "pkg_npm", "pkg_npm_types", "ts_project")

PKG_DIRNAME = "core-integrations-browser-internal"
PKG_REQUIRE_NAME = "@kbn/core-integrations-browser-internal"

SOURCE_FILES = glob(
[
"src/**/*.ts",
"src/**/*.tsx",
"src/**/*.css",
],
exclude = [
"**/*.test.*",
"**/*.stories.*",
],
)

SRCS = SOURCE_FILES

filegroup(
name = "srcs",
srcs = SRCS,
)

NPM_MODULE_EXTRA_FILES = [
"package.json",
]

RUNTIME_DEPS = [
"@npm//rxjs",
"@npm//moment-timezone",
### test dependencies
"//packages/core/ui-settings/core-ui-settings-browser-mocks"
]

TYPES_DEPS = [
"@npm//@types/node",
"@npm//@types/jest",
"@npm//@types/moment-timezone",
"@npm//rxjs",
"//packages/core/base/core-base-browser-internal:npm_module_types",
"//packages/core/ui-settings/core-ui-settings-browser:npm_module_types",
]

jsts_transpiler(
name = "target_node",
srcs = SRCS,
build_pkg_name = package_name(),
)

jsts_transpiler(
name = "target_web",
srcs = SRCS,
build_pkg_name = package_name(),
web = True,
additional_args = [
"--copy-files",
"--quiet"
],
)

ts_config(
name = "tsconfig",
src = "tsconfig.json",
deps = [
"//:tsconfig.base.json",
"//:tsconfig.bazel.json",
],
)

ts_project(
name = "tsc_types",
args = ['--pretty'],
srcs = SRCS,
deps = TYPES_DEPS,
declaration = True,
declaration_map = True,
emit_declaration_only = True,
out_dir = "target_types",
root_dir = "src",
tsconfig = ":tsconfig",
)

js_library(
name = PKG_DIRNAME,
srcs = NPM_MODULE_EXTRA_FILES,
deps = RUNTIME_DEPS + [":target_node", ":target_web"],
package_name = PKG_REQUIRE_NAME,
visibility = ["//visibility:public"],
)

pkg_npm(
name = "npm_module",
deps = [":" + PKG_DIRNAME],
)

filegroup(
name = "build",
srcs = [":npm_module"],
visibility = ["//visibility:public"],
)

pkg_npm_types(
name = "npm_module_types",
srcs = SRCS,
deps = [":tsc_types"],
package_name = PKG_REQUIRE_NAME,
tsconfig = ":tsconfig",
visibility = ["//visibility:public"],
)

filegroup(
name = "build_types",
srcs = [":npm_module_types"],
visibility = ["//visibility:public"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# @kbn/core-integrations-browser-internal

Empty package generated by @kbn/generate
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

module.exports = {
preset: '@kbn/test',
rootDir: '../../../..',
roots: ['<rootDir>/packages/core/integrations/core-integrations-browser-internal'],
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "@kbn/core-integrations-browser-internal",
"private": true,
"version": "1.0.0",
"main": "./target_node/index.js",
"browser": "./target_web/index.js",
"license": "SSPL-1.0 OR Elastic License 2.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
*/

export { IntegrationsService } from './integrations_service';
export type { IntegrationsServiceSetupDeps } from './integrations_service';
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
import { MomentService } from './moment';
import { StylesService } from './styles';

export interface Deps {
export interface IntegrationsServiceSetupDeps {
uiSettings: IUiSettingsClient;
}

Expand All @@ -26,7 +26,7 @@ export class IntegrationsService implements CoreService {
await this.moment.setup();
}

public async start({ uiSettings }: Deps) {
public async start({ uiSettings }: IntegrationsServiceSetupDeps) {
await this.styles.start({ uiSettings });
await this.moment.start({ uiSettings });
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
/**
* `react-beautiful-dnd` relies on `transition` for functionality
* https://github.com/elastic/kibana/issues/95133
* https://github.com/elastic/kibana/issues/95133
*/
*:not(.essentialAnimation):not([data-rbd-draggable-context-id]):not([data-rbd-droppable-context-id]),
*:not(.essentialAnimation):before,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"extends": "../../../../tsconfig.bazel.json",
"compilerOptions": {
"declaration": true,
"declarationMap": true,
"emitDeclarationOnly": true,
"outDir": "target_types",
"rootDir": "src",
"stripInternal": false,
"types": [
"jest",
"node",
"react"
]
},
"include": [
"src/**/*"
]
}
Loading

0 comments on commit 743c2ba

Please sign in to comment.