Merge branch 'master' into issue-110532-security-usage-data

.buildkite/scripts/common/env.sh

@@ -70,3 +70,4 @@ export TEST_ES_URL="http://elastic:changeme@localhost:6102"
 export TEST_ES_TRANSPORT_PORT=6301-6309
 export TEST_CORS_SERVER_PORT=6106
 export ALERTING_PROXY_PORT=6105
+export TEST_PROXY_SERVER_PORT=6107

package.json

@@ -332,7 +332,7 @@
     "raw-loader": "^3.1.0",
     "rbush": "^3.0.1",
     "re-resizable": "^6.1.1",
-    "re2": "^1.15.4",
+    "re2": "^1.16.0",
     "react": "^16.12.0",
     "react-ace": "^7.0.5",
     "react-beautiful-dnd": "^13.0.0",
@@ -429,6 +429,7 @@
   "devDependencies": {
     "@babel/cli": "^7.12.10",
     "@babel/core": "^7.12.10",
+    "@babel/generator": "^7.12.11",
     "@babel/parser": "^7.12.11",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
     "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
@@ -788,7 +789,7 @@
     "multimatch": "^4.0.0",
     "mutation-observer": "^1.0.3",
     "ncp": "^2.0.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "null-loader": "^3.0.0",
     "nyc": "^15.0.1",
     "oboe": "^2.1.4",
@@ -808,7 +809,7 @@
     "regenerate": "^1.4.0",
     "resolve": "^1.7.1",
     "rxjs-marbles": "^5.0.6",
-    "sass-loader": "^8.0.2",
+    "sass-loader": "^10.2.0",
     "sass-resources-loader": "^2.0.1",
     "selenium-webdriver": "^4.0.0-alpha.7",
     "serve-static": "1.14.1",

packages/kbn-dev-utils/BUILD.bazel

@@ -57,6 +57,7 @@ RUNTIME_DEPS = [
   "@npm//load-json-file",
   "@npm//markdown-it",
   "@npm//normalize-path",
+  "@npm//prettier",
   "@npm//rxjs",
   "@npm//tar",
   "@npm//tree-kill",
@@ -81,6 +82,7 @@ TYPES_DEPS = [
   "@npm//@types/markdown-it",
   "@npm//@types/node",
   "@npm//@types/normalize-path",
+  "@npm//@types/prettier",
   "@npm//@types/react",
   "@npm//@types/tar",
   "@npm//@types/testing-library__jest-dom",

packages/kbn-dev-utils/src/index.ts

@@ -32,3 +32,4 @@ export * from './plugins';
 export * from './streams';
 export * from './babel';
 export * from './extract';
+export * from './vscode_config';

packages/kbn-dev-utils/src/vscode_config/index.ts

@@ -0,0 +1,9 @@
+/*
+ * 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.
+ */
+
+export * from './update_vscode_config_cli';

packages/kbn-dev-utils/src/vscode_config/managed_config_keys.ts

@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+export interface ManagedConfigKey {
+  key: string;
+  value: Record<string, any>;
+}
+
+/**
+ * Defines the keys which we overrite in user's vscode config for the workspace. We currently
+ * only support object values because that's all we needed to support, but support for non object
+ * values should be easy to add.
+ */
+export const MANAGED_CONFIG_KEYS: ManagedConfigKey[] = [
+  {
+    key: 'files.watcherExclude',
+    value: {
+      ['**/.eslintcache']: true,
+      ['**/.es']: true,
+      ['**/.yarn-local-mirror']: true,
+      ['**/.chromium']: true,
+      ['**/packages/kbn-pm/dist/index.js']: true,
+      ['**/bazel-*']: true,
+      ['**/node_modules']: true,
+      ['**/target']: true,
+      ['**/*.log']: true,
+    },
+  },
+  {
+    key: 'search.exclude',
+    value: {
+      ['**/packages/kbn-pm/dist/index.js']: true,
+    },
+  },
+];