Merge branch '7.x' into backport/7.x/pr-68257

CONTRIBUTING.md

@@ -632,18 +632,23 @@ To build the docs, you must clone the [elastic/docs](https://github.com/elastic/
 repo as a sibling of your kibana repo. Follow the instructions in that project's
 README for getting the docs tooling set up.
 
-**To build the docs and open them in your browser:**
+**To build the Kibana docs and open them in your browser:**
+
+```bash
+./docs/build_docs --doc kibana/docs/index.asciidoc --chunk 1 --open
+```
+or
 
 ```bash
 node scripts/docs.js --open
 ```
 
-### Release Notes Process
+### Release Notes process
 
 Part of this process only applies to maintainers, since it requires access to GitHub labels.
 
-Kibana publishes major, minor and patch releases periodically through the year. During this process we run a script against this repo to collect the applicable PRs against that release and generate [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html).
-To include your change in the Release Notes:
+Kibana publishes [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html) for major and minor releases.  To generate the Release Notes, the writers run a script against this repo to collect the merged PRs against the release.
+To include your PRs in the Release Notes:
 
 1. In the title, summarize what the PR accomplishes in language that is meaningful to the user.  In general, use present tense (for example, Adds, Fixes) in sentence case.
 2. Label the PR with the targeted version (ex: `v7.3.0`).
@@ -652,9 +657,9 @@ To include your change in the Release Notes:
     * For an external-facing fix, use `release_note:fix`. Exception: docs, build, and test fixes do not go in the Release Notes. Neither fixes for issues that were only on `master` and never have been released.
     * For a deprecated feature, use `release_note:deprecation`.
     * For a breaking change, use `release_note:breaking`.
-    * To **NOT** include your changes in the Release Notes, please use `release_note:skip`.
+    * To **NOT** include your changes in the Release Notes, use `release_note:skip`.
 
-We also produce a blog post that details more important breaking API changes every minor and major release. If the PR includes a breaking API change, apply the label `release_note:dev_docs`. Additionally add a brief summary of the break at the bottom of the PR using the format below:
+We also produce a blog post that details more important breaking API changes in every major and minor release. When your PR includes a breaking API change, add the `release_note:dev_docs` label, and add a brief summary of the break at the bottom of the PR using the format below:
 
 ```
 # Dev Docs

package.json

@@ -124,7 +124,7 @@
     "@elastic/charts": "19.2.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "7.8.0",
-    "@elastic/eui": "23.3.1",
+    "@elastic/eui": "24.1.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",

packages/kbn-pm/dist/index.js

@@ -55324,6 +55324,7 @@ __webpack_require__.r(__webpack_exports__);
  * under the License.
  */
 
+const YARN_EXEC = process.env.npm_execpath || 'yarn';
 
 /**
  * Install all dependencies in the given directory
@@ -55332,7 +55333,7 @@ async function installInDir(directory, extraArgs = []) {
   const options = ['install', '--non-interactive', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any
   // given time (e.g. to avoid conflicts).
 
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', options, {
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, options, {
     cwd: directory
   });
 }
@@ -55344,7 +55345,7 @@ async function runScriptInPackage(script, args, pkg) {
   const execOpts = {
     cwd: pkg.path
   };
-  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', ['run', script, ...args], execOpts);
+  await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, ['run', script, ...args], execOpts);
 }
 /**
  * Run script in the given directory
@@ -55359,15 +55360,15 @@ function runScriptInPackageStreaming({
   const execOpts = {
     cwd: pkg.path
   };
-  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])('yarn', ['run', script, ...args], execOpts, {
+  return Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawnStreaming"])(YARN_EXEC, ['run', script, ...args], execOpts, {
     prefix: pkg.name,
     debug
   });
 }
 async function yarnWorkspacesInfo(directory) {
   const {
     stdout
-  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])('yarn', ['--json', 'workspaces', 'info'], {
+  } = await Object(_child_process__WEBPACK_IMPORTED_MODULE_0__["spawn"])(YARN_EXEC, ['--json', 'workspaces', 'info'], {
     cwd: directory,
     stdio: 'pipe'
   });

packages/kbn-pm/src/utils/scripts.ts

@@ -20,6 +20,8 @@
 import { spawn, spawnStreaming } from './child_process';
 import { Project } from './project';
 
+const YARN_EXEC = process.env.npm_execpath || 'yarn';
+
 interface WorkspaceInfo {
   location: string;
   workspaceDependencies: string[];
@@ -37,7 +39,7 @@ export async function installInDir(directory: string, extraArgs: string[] = [])
 
   // We pass the mutex flag to ensure only one instance of yarn runs at any
   // given time (e.g. to avoid conflicts).
-  await spawn('yarn', options, {
+  await spawn(YARN_EXEC, options, {
     cwd: directory,
   });
 }
@@ -50,7 +52,7 @@ export async function runScriptInPackage(script: string, args: string[], pkg: Pr
     cwd: pkg.path,
   };
 
-  await spawn('yarn', ['run', script, ...args], execOpts);
+  await spawn(YARN_EXEC, ['run', script, ...args], execOpts);
 }
 
 /**
@@ -71,14 +73,14 @@ export function runScriptInPackageStreaming({
     cwd: pkg.path,
   };
 
-  return spawnStreaming('yarn', ['run', script, ...args], execOpts, {
+  return spawnStreaming(YARN_EXEC, ['run', script, ...args], execOpts, {
     prefix: pkg.name,
     debug,
   });
 }
 
 export async function yarnWorkspacesInfo(directory: string): Promise<WorkspacesInfo> {
-  const { stdout } = await spawn('yarn', ['--json', 'workspaces', 'info'], {
+  const { stdout } = await spawn(YARN_EXEC, ['--json', 'workspaces', 'info'], {
     cwd: directory,
     stdio: 'pipe',
   });

packages/kbn-storybook/storybook_config/webpack.config.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-const { resolve } = require('path');
+const { parse, resolve } = require('path');
 const webpack = require('webpack');
 const { stringifyRequest } = require('loader-utils');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -95,6 +95,27 @@ module.exports = async ({ config }) => {
           },
         },
       },
+      {
+        loader: 'resolve-url-loader',
+        options: {
+          // If you don't have arguments (_, __) to the join function, the
+          // resolve-url-loader fails with a loader misconfiguration error.
+          //
+          // eslint-disable-next-line no-unused-vars
+          join: (_, __) => (uri, base) => {
+            if (!base || !parse(base).dir.includes('legacy')) {
+              return null;
+            }
+
+            // URIs on mixins in src/legacy/public/styles need to be resolved.
+            if (uri.startsWith('ui/assets')) {
+              return resolve(REPO_ROOT, 'src/core/server/core_app/', uri.replace('ui/', ''));
+            }
+
+            return null;
+          },
+        },
+      },
       {
         loader: 'sass-loader',
         options: {

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

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "19.2.0",
-    "@elastic/eui": "23.3.1",
+    "@elastic/eui": "24.1.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",