chore(NA): merge and solve conflicts with main

.buildkite/scripts/common/util.sh

@@ -16,12 +16,14 @@ is_pr() {
 
 verify_no_git_changes() {
   RED='\033[0;31m'
+  YELLOW='\033[0;33m'
   C_RESET='\033[0m' # Reset color
 
   GIT_CHANGES="$(git ls-files --modified -- . ':!:.bazelrc')"
   if [ "$GIT_CHANGES" ]; then
     echo -e "\n${RED}ERROR: '$1' caused changes to the following files:${C_RESET}\n"
     echo -e "$GIT_CHANGES\n"
+    echo -e "\n${YELLOW}TO FIX: Run '$1' locally, commit the changes and push to your branch${C_RESET}\n"
     exit 1
   fi
 }

package.json

@@ -37,44 +37,47 @@
   },
   "author": "Rashid Khan <[email protected]>",
   "scripts": {
+    "backport-skip-ci": "backport --prDescription \"[skip-ci]\"",
     "bazel": "bazel",
-    "preinstall": "node ./preinstall_check",
-    "kbn": "node scripts/kbn",
-    "es": "node scripts/es",
-    "test:jest": "node scripts/jest",
-    "test:jest_integration": "node scripts/jest_integration",
-    "test:ftr": "node scripts/functional_tests",
-    "test:ftr:server": "node scripts/functional_tests_server",
-    "test:ftr:runner": "node scripts/functional_test_runner",
-    "checkLicenses": "node scripts/check_licenses --dev",
     "build": "node scripts/build --all-platforms",
     "build:apidocs": "node scripts/build_api_docs",
-    "start": "node scripts/kibana --dev",
+    "build:types": "rm -rf ./target/types && tsc --p tsconfig.types.json",
+    "checkLicenses": "node scripts/check_licenses --dev",
+    "cover:functional:merge": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report/functional --reporter=json-summary",
+    "cover:report": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report --reporter=lcov && open ./target/coverage/report/lcov-report/index.html",
     "debug": "node --nolazy --inspect scripts/kibana --dev",
     "debug-break": "node --nolazy --inspect-brk scripts/kibana --dev",
+    "docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
+    "es": "node scripts/es",
+    "preinstall": "node ./preinstall_check",
+    "postinstall": "node scripts/kbn patch_native_modules",
+    "kbn": "node scripts/kbn",
     "lint": "yarn run lint:es && yarn run lint:style",
     "lint:es": "node scripts/eslint",
     "lint:style": "node scripts/stylelint",
     "makelogs": "node scripts/makelogs",
-    "build:types": "rm -rf ./target/types && tsc --p tsconfig.types.json",
-    "docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
     "spec_to_console": "node scripts/spec_to_console",
-    "backport-skip-ci": "backport --prDescription \"[skip-ci]\"",
+    "start": "node scripts/kibana --dev",
     "storybook": "node scripts/storybook",
-    "cover:report": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report --reporter=lcov && open ./target/coverage/report/lcov-report/index.html",
-    "cover:functional:merge": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report/functional --reporter=json-summary",
-    "postinstall": "node scripts/kbn patch_native_modules"
+    "test:ftr": "node scripts/functional_tests",
+    "test:ftr:runner": "node scripts/functional_test_runner",
+    "test:ftr:server": "node scripts/functional_tests_server",
+    "test:jest": "node scripts/jest",
+    "test:jest_integration": "node scripts/jest_integration"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/elastic/kibana.git"
   },
+  "engines": {
+    "node": "16.13.0",
+    "yarn": "^1.21.1"
+  },
   "resolutions": {
     "**/@types/node": "16.10.2",
     "**/chokidar": "^3.4.3",
     "**/deepmerge": "^4.2.2",
     "**/fast-deep-equal": "^3.1.1",
-    "globby/fast-glob": "3.2.5",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-fetch/node-fetch": "^2.6.1",
     "**/istanbul-instrumenter-loader/schema-utils": "1.0.0",
@@ -85,14 +88,11 @@
     "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
     "**/trim": "1.0.1",
     "**/typescript": "4.1.3",
-    "**/underscore": "^1.13.1"
-  },
-  "engines": {
-    "node": "16.13.0",
-    "yarn": "^1.21.1"
+    "**/underscore": "^1.13.1",
+    "globby/fast-glob": "3.2.5"
   },
   "dependencies": {
-    "@babel/runtime": "^7.15.4",
+    "@babel/runtime": "^7.16.3",
     "@dnd-kit/core": "^3.1.1",
     "@dnd-kit/sortable": "^4.0.0",
     "@dnd-kit/utilities": "^2.0.0",
@@ -410,25 +410,25 @@
     "yauzl": "^2.10.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.15.7",
-    "@babel/core": "^7.15.8",
-    "@babel/eslint-parser": "^7.15.8",
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/eslint-parser": "^7.16.3",
     "@babel/eslint-plugin": "^7.14.5",
-    "@babel/generator": "^7.15.8",
-    "@babel/parser": "^7.15.8",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
-    "@babel/plugin-proposal-optional-chaining": "^7.14.5",
-    "@babel/plugin-proposal-private-methods": "^7.14.5",
-    "@babel/plugin-transform-runtime": "^7.15.8",
-    "@babel/preset-env": "^7.15.8",
-    "@babel/preset-react": "^7.14.5",
-    "@babel/preset-typescript": "^7.15.0",
-    "@babel/register": "^7.15.3",
-    "@babel/traverse": "^7.15.4",
-    "@babel/types": "^7.15.6",
+    "@babel/generator": "^7.16.0",
+    "@babel/parser": "^7.16.3",
+    "@babel/plugin-proposal-class-properties": "^7.16.0",
+    "@babel/plugin-proposal-export-namespace-from": "^7.16.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.0",
+    "@babel/plugin-proposal-private-methods": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "@babel/preset-react": "^7.16.0",
+    "@babel/preset-typescript": "^7.16.0",
+    "@babel/register": "^7.16.0",
+    "@babel/traverse": "^7.16.3",
+    "@babel/types": "^7.16.0",
     "@bazel/ibazel": "^0.15.10",
     "@bazel/typescript": "^3.8.0",
     "@cypress/snapshot": "^2.1.7",
@@ -511,9 +511,9 @@
     "@types/deep-freeze-strict": "^1.1.0",
     "@types/delete-empty": "^2.0.0",
     "@types/ejs": "^3.0.6",
-    "@types/elasticsearch": "^5.0.33",
     "@types/elastic__apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace/npm_module_types",
     "@types/elastic__datemath": "link:bazel-bin/packages/elastic-datemath/npm_module_types",
+    "@types/elasticsearch": "^5.0.33",
     "@types/enzyme": "^3.10.8",
     "@types/eslint": "^7.28.0",
     "@types/extract-zip": "^1.6.2",
@@ -655,9 +655,9 @@
     "babel-jest": "^26.6.3",
     "babel-loader": "^8.2.2",
     "babel-plugin-add-module-exports": "^1.0.4",
-    "babel-plugin-istanbul": "^6.0.0",
+    "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-require-context-hook": "^1.0.0",
-    "babel-plugin-styled-components": "^1.13.2",
+    "babel-plugin-styled-components": "^1.13.3",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "backport": "^5.6.6",
     "callsites": "^3.1.0",
@@ -793,6 +793,7 @@
     "shelljs": "^0.8.4",
     "simple-git": "1.116.0",
     "sinon": "^7.4.2",
+    "sort-package-json": "^1.53.1",
     "spawn-sync": "^1.0.15",
     "string-replace-loader": "^2.2.0",
     "strong-log-transformer": "^2.1.0",
@@ -829,4 +830,4 @@
     "yargs": "^15.4.1",
     "zlib": "^1.0.5"
   }
-}
+}

packages/elastic-apm-synthtrace/src/index.ts

@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+export { Exception } from './lib/entity';
 export { service, Service } from './lib/service';
 export { browser, Browser } from './lib/browser';
 export { timerange, Timerange } from './lib/timerange';

packages/kbn-babel-preset/node_preset.js

@@ -32,6 +32,7 @@ module.exports = (_, options = {}) => {
           // in the package.json in order to have the same polyfills between the environment
           // and the tests
           corejs: '3.2.1',
+          bugfixes: true,
 
           ...(options['@babel/preset-env'] || {}),
         },

packages/kbn-babel-preset/webpack_preset.js

@@ -19,6 +19,7 @@ module.exports = () => {
           // Please read the explanation for this
           // in node_preset.js
           corejs: '3.2.1',
+          bugfixes: true,
         },
       ],
       require('./common_preset'),