Skip to content

Commit

Permalink
Merge branch 'master' into console-proxy-system-index
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Mar 29, 2021
2 parents b145b6e + 4342f26 commit bad47e6
Show file tree
Hide file tree
Showing 1,925 changed files with 52,685 additions and 25,088 deletions.
118 changes: 71 additions & 47 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,72 @@ const SAFER_LODASH_SET_DEFINITELYTYPED_HEADER = `
*/
`;

/** Packages which should not be included within production code. */
const DEV_PACKAGES = [
'kbn-babel-code-parser',
'kbn-dev-utils',
'kbn-docs-utils',
'kbn-es*',
'kbn-eslint*',
'kbn-optimizer',
'kbn-plugin-generator',
'kbn-plugin-helpers',
'kbn-pm',
'kbn-storybook',
'kbn-telemetry-tools',
'kbn-test',
];

/** Directories (at any depth) which include dev-only code. */
const DEV_DIRECTORIES = [
'.storybook',
'__tests__',
'__test__',
'__jest__',
'__fixtures__',
'__mocks__',
'__stories__',
'e2e',
'fixtures',
'ftr_e2e',
'integration_tests',
'manual_tests',
'mock',
'storybook',
'scripts',
'test',
'test-d',
'test_utils',
'test_utilities',
'test_helpers',
'tests_client_integration',
];

/** File patterns for dev-only code. */
const DEV_FILE_PATTERNS = [
'*.mock.{js,ts,tsx}',
'*.test.{js,ts,tsx}',
'*.test.helpers.{js,ts,tsx}',
'*.stories.{js,ts,tsx}',
'*.story.{js,ts,tsx}',
'*.stub.{js,ts,tsx}',
'mock.{js,ts,tsx}',
'_stubs.{js,ts,tsx}',
'{testHelpers,test_helper,test_utils}.{js,ts,tsx}',
'{postcss,webpack}.config.js',
];

/** Glob patterns which describe dev-only code. */
const DEV_PATTERNS = [
...DEV_PACKAGES.map((pkg) => `packages/${pkg}/**/*`),
...DEV_DIRECTORIES.map((dir) => `{packages,src,x-pack}/**/${dir}/**/*`),
...DEV_FILE_PATTERNS.map((file) => `{packages,src,x-pack}/**/${file}`),
'packages/kbn-interpreter/tasks/**/*',
'src/dev/**/*',
'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*',
'x-pack/plugins/*/server/scripts/**/*',
];

module.exports = {
root: true,

Expand Down Expand Up @@ -491,43 +557,17 @@ module.exports = {
},

/**
* Files that ARE NOT allowed to use devDependencies
*/
{
files: ['x-pack/**/*.js', 'packages/kbn-interpreter/**/*.js'],
rules: {
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: false,
peerDependencies: true,
packageDir: '.',
},
],
},
},

/**
* Files that ARE allowed to use devDependencies
* Single package.json rules, it tells eslint to ignore the child package.json files
* and look for dependencies declarations in the single and root level package.json
*/
{
files: [
'packages/kbn-es/src/**/*.js',
'packages/kbn-interpreter/tasks/**/*.js',
'packages/kbn-interpreter/src/plugin/**/*.js',
'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*.js',
'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__,public}/**/*.js',
'x-pack/**/*.test.js',
'x-pack/test_utils/**/*',
'x-pack/gulpfile.js',
'x-pack/plugins/apm/public/utils/testHelpers.js',
'x-pack/plugins/canvas/shareable_runtime/postcss.config.js',
],
files: ['{src,x-pack,packages}/**/*.{js,mjs,ts,tsx}'],
rules: {
'import/no-extraneous-dependencies': [
'error',
{
devDependencies: true,
/* Files that ARE allowed to use devDependencies */
devDependencies: [...DEV_PATTERNS],
peerDependencies: true,
packageDir: '.',
},
Expand Down Expand Up @@ -1420,21 +1460,5 @@ module.exports = {
],
},
},

/**
* Single package.json rules, it tells eslint to ignore the child package.json files
* and look for dependencies declarations in the single and root level package.json
*/
{
files: ['**/*.{js,mjs,ts,tsx}'],
rules: {
'import/no-extraneous-dependencies': [
'error',
{
packageDir: '.',
},
],
},
},
],
};
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
/x-pack/plugins/runtime_fields @elastic/kibana-app-services
/x-pack/test/search_sessions_integration/ @elastic/kibana-app-services
#CC# /src/plugins/bfetch/ @elastic/kibana-app-services
#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-services
#CC# /src/plugins/inspector/ @elastic/kibana-app-services
Expand Down
15 changes: 0 additions & 15 deletions .github/ISSUE_TEMPLATE/Question.md

This file was deleted.

5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: Question
url: https://discuss.elastic.co/c/kibana
about: Please ask and answer questions here.
6 changes: 3 additions & 3 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Fetch Node.js rules
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "55a25a762fcf9c9b88ab54436581e671bc9f4f523cb5a1bd32459ebec7be68a8",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.2/rules_nodejs-3.2.2.tar.gz"],
sha256 = "dd7ea7efda7655c218ca707f55c3e1b9c68055a70c31a98f264b3445bc8f4cb1",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.3/rules_nodejs-3.2.3.tar.gz"],
)

# Now that we have the rules let's import from them to complete the work
load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")

# Assure we have at least a given rules_nodejs version
check_rules_nodejs_version(minimum_version_string = "3.2.2")
check_rules_nodejs_version(minimum_version_string = "3.2.3")

# Setup the Node.js toolchain for the architectures we want to support
#
Expand Down
42 changes: 21 additions & 21 deletions api_docs/charts.json
Original file line number Diff line number Diff line change
Expand Up @@ -1597,7 +1597,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 3160
"lineNumber": 174
},
"signature": [
{
Expand Down Expand Up @@ -1816,7 +1816,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 558
"lineNumber": 56
},
"signature": [
{
Expand All @@ -1837,7 +1837,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 559
"lineNumber": 57
}
},
{
Expand All @@ -1848,7 +1848,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 562
"lineNumber": 60
},
"signature": [
"[number, number[]][]"
Expand All @@ -1859,7 +1859,7 @@
"label": "[ColorSchemas.Greens]",
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 557
"lineNumber": 55
}
},
{
Expand All @@ -1875,7 +1875,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1078
"lineNumber": 74
},
"signature": [
{
Expand All @@ -1896,7 +1896,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1079
"lineNumber": 75
}
},
{
Expand All @@ -1907,7 +1907,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1082
"lineNumber": 78
},
"signature": [
"[number, number[]][]"
Expand All @@ -1918,7 +1918,7 @@
"label": "[ColorSchemas.Greys]",
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1077
"lineNumber": 73
}
},
{
Expand All @@ -1934,7 +1934,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1598
"lineNumber": 92
},
"signature": [
{
Expand All @@ -1955,7 +1955,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1599
"lineNumber": 93
}
},
{
Expand All @@ -1966,7 +1966,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1602
"lineNumber": 96
},
"signature": [
"[number, number[]][]"
Expand All @@ -1977,7 +1977,7 @@
"label": "[ColorSchemas.Reds]",
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 1597
"lineNumber": 91
}
},
{
Expand All @@ -1993,7 +1993,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2118
"lineNumber": 110
},
"signature": [
{
Expand All @@ -2014,7 +2014,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2119
"lineNumber": 111
}
},
{
Expand All @@ -2025,7 +2025,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2122
"lineNumber": 114
},
"signature": [
"[number, number[]][]"
Expand All @@ -2036,7 +2036,7 @@
"label": "[ColorSchemas.YellowToRed]",
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2117
"lineNumber": 109
}
},
{
Expand All @@ -2052,7 +2052,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2639
"lineNumber": 129
},
"signature": [
{
Expand All @@ -2073,7 +2073,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2640
"lineNumber": 130
}
},
{
Expand All @@ -2084,7 +2084,7 @@
"description": [],
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2643
"lineNumber": 133
},
"signature": [
"[number, number[]][]"
Expand All @@ -2095,7 +2095,7 @@
"label": "[ColorSchemas.GreenToRed]",
"source": {
"path": "src/plugins/charts/public/static/color_maps/color_maps.ts",
"lineNumber": 2638
"lineNumber": 128
}
}
],
Expand Down
Loading

0 comments on commit bad47e6

Please sign in to comment.