merge master / fix conflicts

Author: kertal

.github/workflows/pr-project-assigner.yml

@@ -11,5 +11,5 @@ jobs:
         uses: elastic/github-actions/project-assigner@v1.0.0
         id: project_assigner
         with:
-          issue-mappings: '[{"label": "Team:AppAch", "projectName": "kibana-app-arch", "columnId": 6173897}]'
-          ghToken: ${{ secrets.GITHUB_TOKEN }}
+          issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173897}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219362}]'
+          ghToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/project-assigner.yml

@@ -11,7 +11,7 @@ jobs:
         uses: elastic/github-actions/project-assigner@v1.0.0
         id: project_assigner
         with:
-          issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}]'
+          issue-mappings: '[{"label": "Team:AppArch", "projectName": "kibana-app-arch", "columnId": 6173895}, {"label": "Feature:Lens", "projectName": "Lens", "columnId": 6219363}]'
           ghToken: ${{ secrets.GITHUB_TOKEN }}
 
 

.gitignore

@@ -29,7 +29,6 @@ disabledPlugins
 webpackstats.json
 /config/*
 !/config/kibana.yml
-!/config/apm.js
 coverage
 selenium
 .babel_register_cache.json

.node-version

@@ -1 +1 @@
-10.15.2
+10.18.0

.nvmrc

@@ -1 +1 @@
-10.15.2
+10.18.0

config/apm.js

@@ -112,10 +112,11 @@
   "dependencies": {
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.7.0",
+    "@elastic/apm-rum": "^4.6.0",
     "@elastic/charts": "^14.0.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "1.0.5",
-    "@elastic/eui": "17.0.0",
+    "@elastic/eui": "17.1.2",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",
@@ -364,8 +365,8 @@
     "@types/uuid": "^3.4.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^2.10.0",
-    "@typescript-eslint/parser": "^2.10.0",
+    "@typescript-eslint/eslint-plugin": "^2.12.0",
+    "@typescript-eslint/parser": "^2.12.0",
     "angular-mocks": "^1.7.8",
     "archiver": "^3.1.1",
     "axe-core": "^3.3.2",
@@ -467,7 +468,7 @@
     "zlib": "^1.0.5"
   },
   "engines": {
-    "node": "10.15.2",
+    "node": "10.18.0",
     "yarn": "^1.21.1"
   }
 }

package.json

@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/elastic/eslint-config-kibana#readme",
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^2.10.0",
-    "@typescript-eslint/parser": "^2.10.0",
+    "@typescript-eslint/eslint-plugin": "^2.12.0",
+    "@typescript-eslint/parser": "^2.12.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.5.1",
     "eslint-plugin-babel": "^5.3.0",

packages/eslint-config-kibana/package.json

@@ -18,6 +18,7 @@
  */
 
 import { PromiseType } from 'utility-types';
+export { $Values, Required, Optional, Class } from 'utility-types';
 
 /**
  * Returns wrapped type of a promise.

packages/kbn-utility-types/index.ts

@@ -13,7 +13,7 @@
     "clean": "del target"
   },
   "dependencies": {
-    "utility-types": "^3.7.0"
+    "utility-types": "^3.10.0"
   },
   "devDependencies": {
     "del-cli": "^3.0.0",