Merge remote-tracking branch 'upstream/master' into alerting_expose_default_action_group_as_props

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: YulNaumenko

CONTRIBUTING.md

@@ -55,11 +55,9 @@ Granted that you share your thoughts, we might even be able to come up with crea
 
 First of all, **sorry about that!** We want you to have a great time with Kibana.
 
-Hosting meaningful discussions on GitHub can be challenging. For that reason, we'll sometimes ask that you join us on IRC _([#kibana](https://kiwiirc.com/client/irc.freenode.net/?#kibana) on freenode)_ to chat about your issues. You may also experience **faster response times** when engaging us via IRC.
-
 There's hundreds of open issues and prioritizing what to work on is an important aspect of our daily jobs. We prioritize issues according to impact and difficulty, so some issues can be neglected while we work on more pressing issues.
 
-Feel free to bump your issues if you think they've been neglected for a prolonged period, or just jump on IRC and let us have it!
+Feel free to bump your issues if you think they've been neglected for a prolonged period.
 
 ### "I want to help!"
 

package.json

@@ -140,7 +140,7 @@
     "@kbn/ui-framework": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",
     "JSONStream": "1.3.5",
-    "abort-controller": "^3.0.0",
+    "abortcontroller-polyfill": "^1.4.0",
     "angular": "^1.7.9",
     "angular-aria": "^1.7.9",
     "angular-elastic": "^2.5.1",

packages/kbn-optimizer/package.json

@@ -31,6 +31,7 @@
     "node-sass": "^4.13.0",
     "postcss-loader": "^3.0.0",
     "raw-loader": "^3.1.0",
+    "resolve-url-loader": "^3.1.1",
     "rxjs": "^6.5.3",
     "sass-loader": "^8.0.2",
     "style-loader": "^1.1.3",

packages/kbn-optimizer/src/integration_tests/basic_optimization.test.ts

@@ -33,7 +33,7 @@ const MOCK_REPO_DIR = Path.resolve(TMP_DIR, 'mock_repo');
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer(MOCK_REPO_DIR));
 
-beforeEach(async () => {
+beforeAll(async () => {
   await del(TMP_DIR);
   await cpy('**/*', MOCK_REPO_DIR, {
     cwd: MOCK_REPO_SRC,
@@ -42,7 +42,7 @@ beforeEach(async () => {
   });
 });
 
-afterEach(async () => {
+afterAll(async () => {
   await del(TMP_DIR);
 });
 
@@ -153,3 +153,32 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
     ]
   `);
 });
+
+it('uses cache on second run and exist cleanly', async () => {
+  const config = OptimizerConfig.create({
+    repoRoot: MOCK_REPO_DIR,
+    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
+    maxWorkerCount: 1,
+  });
+
+  const msgs = await runOptimizer(config)
+    .pipe(
+      tap(state => {
+        if (state.event?.type === 'worker stdio') {
+          // eslint-disable-next-line no-console
+          console.log('worker', state.event.stream, state.event.chunk.toString('utf8'));
+        }
+      }),
+      toArray()
+    )
+    .toPromise();
+
+  expect(msgs.map(m => m.state.phase)).toMatchInlineSnapshot(`
+    Array [
+      "initializing",
+      "initializing",
+      "initializing",
+      "initialized",
+    ]
+  `);
+});

packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts

@@ -44,6 +44,11 @@ export function handleOptimizerCompletion(config: OptimizerConfig) {
             return;
           }
 
+          if (prevState?.phase === 'initialized' && prevState.onlineBundles.length === 0) {
+            // all bundles cached
+            return;
+          }
+
           if (prevState?.phase === 'issue') {
             throw createFailError('webpack issue');
           }

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -126,6 +126,27 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
                     },
                   },
                 },
+                {
+                  loader: 'resolve-url-loader',
+                  options: {
+                    join: (_: string, __: any) => (uri: string, base?: string) => {
+                      if (!base) {
+                        return null;
+                      }
+
+                      // manually force ui/* urls in legacy styles to resolve to ui/legacy/public
+                      if (uri.startsWith('ui/') && base.split(Path.sep).includes('legacy')) {
+                        return Path.resolve(
+                          worker.repoRoot,
+                          'src/legacy/ui/public',
+                          uri.replace('ui/', '')
+                        );
+                      }
+
+                      return null;
+                    },
+                  },
+                },
                 {
                   loader: 'sass-loader',
                   options: {

packages/kbn-pm/dist/index.js

@@ -43046,21 +43046,28 @@ module.exports = require("tty");
 const os = __webpack_require__(11);
 const hasFlag = __webpack_require__(12);
 
-const env = process.env;
+const {env} = process;
 
 let forceColor;
 if (hasFlag('no-color') ||
 	hasFlag('no-colors') ||
-	hasFlag('color=false')) {
-	forceColor = false;
+	hasFlag('color=false') ||
+	hasFlag('color=never')) {
+	forceColor = 0;
 } else if (hasFlag('color') ||
 	hasFlag('colors') ||
 	hasFlag('color=true') ||
 	hasFlag('color=always')) {
-	forceColor = true;
+	forceColor = 1;
 }
 if ('FORCE_COLOR' in env) {
-	forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0;
+	if (env.FORCE_COLOR === true || env.FORCE_COLOR === 'true') {
+		forceColor = 1;
+	} else if (env.FORCE_COLOR === false || env.FORCE_COLOR === 'false') {
+		forceColor = 0;
+	} else {
+		forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
+	}
 }
 
 function translateLevel(level) {
@@ -43077,7 +43084,7 @@ function translateLevel(level) {
 }
 
 function supportsColor(stream) {
-	if (forceColor === false) {
+	if (forceColor === 0) {
 		return 0;
 	}
 
@@ -43091,11 +43098,15 @@ function supportsColor(stream) {
 		return 2;
 	}
 
-	if (stream && !stream.isTTY && forceColor !== true) {
+	if (stream && !stream.isTTY && forceColor === undefined) {
 		return 0;
 	}
 
-	const min = forceColor ? 1 : 0;
+	const min = forceColor || 0;
+
+	if (env.TERM === 'dumb') {
+		return min;
+	}
 
 	if (process.platform === 'win32') {
 		// Node.js 7.5.0 is the first version of Node.js to include a patch to
@@ -43156,10 +43167,6 @@ function supportsColor(stream) {
 		return 1;
 	}
 
-	if (env.TERM === 'dumb') {
-		return min;
-	}
-
 	return min;
 }
 

packages/kbn-ui-shared-deps/package.json

@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@elastic/charts": "^17.0.2",
-    "abort-controller": "^3.0.0",
+    "abortcontroller-polyfill": "^1.4.0",
     "@elastic/eui": "19.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/i18n": "1.0.0",

packages/kbn-ui-shared-deps/polyfills.js

@@ -21,6 +21,6 @@ require('core-js/stable');
 require('regenerator-runtime/runtime');
 require('custom-event-polyfill');
 require('whatwg-fetch');
-require('abort-controller/polyfill');
+require('abortcontroller-polyfill/dist/polyfill-patch-fetch');
 require('./vendor/childnode_remove_polyfill');
 require('symbol-observable');

packages/kbn-utility-types/README.md

@@ -20,8 +20,12 @@ type B = UnwrapPromise<A>; // string
 
 - `Ensure<T, X>` &mdash; Makes sure `T` is of type `X`.
 - `ObservableLike<T>` &mdash; Minimal interface for an object resembling an `Observable`.
+- `PublicContract<T>` &mdash; Returns an object with public keys only.
+- `PublicKeys<T>` &mdash; Returns public keys of an object.
 - `RecursiveReadonly<T>` &mdash; Like `Readonly<T>`, but freezes object recursively.
 - `ShallowPromise<T>` &mdash; Same as `Promise` type, but it flat maps the wrapped type.
+- `UnionToIntersection<T>` &mdash; Converts a union of types into an intersection.
 - `UnwrapObservable<T>` &mdash; Returns wrapped type of an observable.
 - `UnwrapPromise<T>` &mdash; Returns wrapped type of a promise.
 - `UnwrapPromiseOrReturn<T>` &mdash; Returns wrapped type of a promise or the type itself, if it isn't a promise.
+- `Values<T>` &mdash; Returns object or array value types.