Merge remote-tracking branch 'upstream/master' into elastic#63480

.eslintrc.js

@@ -197,6 +197,11 @@ module.exports = {
                 from: ['src/core/utils/**/*'],
                 errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
               },
+              {
+                target: ['(src|x-pack)/plugins/*/public/**/*'],
+                from: ['(src|x-pack)/plugins/*/server/**/*'],
+                errorMessage: `Public code can not import from server, use a common directory.`,
+              },
               {
                 target: [
                   '(src|x-pack)/legacy/**/*',

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md

@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "filters" | "indexPatterns" | "refreshInterval" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated">, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "indexPatterns" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "onRefresh" | "onRefreshChange" | "refreshInterval" | "intl" | "indexPatterns" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "timeHistory" | "onFiltersUpdated"> & ReactIntl.InjectedIntlProps>;
 }
 ```

package.json

@@ -121,12 +121,13 @@
   },
   "dependencies": {
     "@babel/core": "^7.9.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.9.0",
     "@babel/register": "^7.9.0",
     "@elastic/apm-rum": "^5.1.1",
     "@elastic/charts": "19.2.0",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.8.0",
-    "@elastic/eui": "22.3.1",
+    "@elastic/eui": "23.3.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.4.0",

packages/kbn-babel-preset/package.json

@@ -7,8 +7,6 @@
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
     "@babel/plugin-proposal-optional-chaining": "^7.9.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.9.0",
     "@babel/preset-env": "^7.9.0",
     "@babel/preset-react": "^7.9.1",
     "@babel/preset-typescript": "^7.9.0",

packages/kbn-babel-preset/webpack_preset.js

@@ -33,8 +33,6 @@ module.exports = () => {
       require('./common_preset'),
     ],
     plugins: [
-      require.resolve('@babel/plugin-transform-modules-commonjs'),
-      require.resolve('@babel/plugin-syntax-dynamic-import'),
       [
         require.resolve('babel-plugin-styled-components'),
         {

packages/kbn-i18n/src/angular/index.ts

@@ -17,6 +17,11 @@
  * under the License.
  */
 
-export { I18nProvider, I18nServiceType } from './provider';
+export { I18nProvider } from './provider';
+
 export { i18nFilter } from './filter';
 export { i18nDirective } from './directive';
+
+// re-export types: https://github.com/babel/babel-loader/issues/603
+import { I18nServiceType as _I18nServiceType } from './provider';
+export type I18nServiceType = _I18nServiceType;

packages/kbn-i18n/src/react/index.tsx

@@ -17,9 +17,11 @@
  * under the License.
  */
 
+import { InjectedIntl as _InjectedIntl } from 'react-intl';
+export type InjectedIntl = _InjectedIntl;
+
 export {
   intlShape,
-  InjectedIntl,
   FormattedDate,
   FormattedTime,
   FormattedRelative,

packages/kbn-interpreter/.babelrc

@@ -1,6 +1,7 @@
 {
   "presets": ["@kbn/babel-preset/webpack_preset"],
   "plugins": [
+    "@babel/plugin-transform-modules-commonjs",
     ["@babel/plugin-transform-runtime", {
       "regenerator": true
     }]

packages/kbn-interpreter/package.json

@@ -18,6 +18,7 @@
   "devDependencies": {
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.9.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.9.0",
     "@babel/plugin-transform-runtime": "^7.9.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",

packages/kbn-optimizer/src/common/index.ts

@@ -21,7 +21,6 @@ export * from './bundle';
 export * from './bundle_cache';
 export * from './worker_config';
 export * from './worker_messages';
-export * from './parent_messages';
 export * from './compiler_messages';
 export * from './ts_helpers';
 export * from './rxjs_helpers';

packages/kbn-optimizer/src/common/worker_config.ts

@@ -31,6 +31,8 @@ export interface WorkerConfig {
   readonly optimizerCacheKey: unknown;
 }
 
+export type CacheableWorkerConfig = Omit<WorkerConfig, 'watch' | 'profileWebpack'>;
+
 export function parseWorkerConfig(json: string): WorkerConfig {
   try {
     if (typeof json !== 'string') {

packages/kbn-optimizer/src/common/worker_messages.ts

@@ -24,17 +24,13 @@ import {
   CompilerErrorMsg,
 } from './compiler_messages';
 
-export type InternalWorkerMsg =
-  | WorkerPingMsg
+export type WorkerMsg =
   | CompilerRunningMsg
   | CompilerIssueMsg
   | CompilerSuccessMsg
   | CompilerErrorMsg
   | WorkerErrorMsg;
 
-// ping messages are internal, they don't apper in public message streams
-export type WorkerMsg = Exclude<InternalWorkerMsg, WorkerPingMsg>;
-
 /**
  * Message sent when the worker encounters an error that it can't
  * recover from, no more messages will be sent and the worker
@@ -46,10 +42,6 @@ export interface WorkerErrorMsg {
   errorStack?: string;
 }
 
-export interface WorkerPingMsg {
-  type: 'ping';
-}
-
 const WORKER_STATE_TYPES: ReadonlyArray<WorkerMsg['type']> = [
   'running',
   'compiler issue',
@@ -58,19 +50,10 @@ const WORKER_STATE_TYPES: ReadonlyArray<WorkerMsg['type']> = [
   'worker error',
 ];
 
-export const isWorkerPing = (value: any): value is WorkerPingMsg =>
-  typeof value === 'object' && value && value.type === 'ping';
-
 export const isWorkerMsg = (value: any): value is WorkerMsg =>
   typeof value === 'object' && value && WORKER_STATE_TYPES.includes(value.type);
 
 export class WorkerMsgs {
-  ping(): WorkerPingMsg {
-    return {
-      type: 'ping',
-    };
-  }
-
   error(error: Error): WorkerErrorMsg {
     return {
       type: 'worker error',

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

@@ -34,6 +34,19 @@ const MOCK_REPO_DIR = Path.resolve(TMP_DIR, 'mock_repo');
 
 expect.addSnapshotSerializer(createAbsolutePathSerializer(REPO_ROOT));
 
+const log = new ToolingLog({
+  level: 'error',
+  writeTo: {
+    write(chunk) {
+      if (chunk.endsWith('\n')) {
+        chunk = chunk.slice(0, -1);
+      }
+      // eslint-disable-next-line no-console
+      console.error(chunk);
+    },
+  },
+});
+
 beforeAll(async () => {
   await del(TMP_DIR);
   await cpy('**/*', MOCK_REPO_DIR, {
@@ -52,23 +65,11 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
     repoRoot: MOCK_REPO_DIR,
     pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
     maxWorkerCount: 1,
-    dist: true,
+    dist: false,
   });
 
   expect(config).toMatchSnapshot('OptimizerConfig');
 
-  const log = new ToolingLog({
-    level: 'error',
-    writeTo: {
-      write(chunk) {
-        if (chunk.endsWith('\n')) {
-          chunk = chunk.slice(0, -1);
-        }
-        // eslint-disable-next-line no-console
-        console.error(chunk);
-      },
-    },
-  });
   const msgs = await runOptimizer(config)
     .pipe(logOptimizerState(log, config), toArray())
     .toPromise();
@@ -125,13 +126,6 @@ it('builds expected bundles, saves bundle counts to metadata', async () => {
   );
   assert('produce zero unexpected states', otherStates.length === 0, otherStates);
 
-  expectFileMatchesSnapshotWithCompression('plugins/foo/target/public/foo.plugin.js', 'foo bundle');
-  expectFileMatchesSnapshotWithCompression(
-    'plugins/foo/target/public/1.plugin.js',
-    '1 async bundle'
-  );
-  expectFileMatchesSnapshotWithCompression('plugins/bar/target/public/bar.plugin.js', 'bar bundle');
-
   const foo = config.bundles.find(b => b.id === 'foo')!;
   expect(foo).toBeTruthy();
   foo.cache.refresh();
@@ -174,7 +168,7 @@ it('uses cache on second run and exist cleanly', async () => {
     repoRoot: MOCK_REPO_DIR,
     pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
     maxWorkerCount: 1,
-    dist: true,
+    dist: false,
   });
 
   const msgs = await runOptimizer(config)
@@ -200,6 +194,26 @@ it('uses cache on second run and exist cleanly', async () => {
   `);
 });
 
+it('prepares assets for distribution', async () => {
+  const config = OptimizerConfig.create({
+    repoRoot: MOCK_REPO_DIR,
+    pluginScanDirs: [Path.resolve(MOCK_REPO_DIR, 'plugins')],
+    maxWorkerCount: 1,
+    dist: true,
+  });
+
+  await runOptimizer(config)
+    .pipe(logOptimizerState(log, config), toArray())
+    .toPromise();
+
+  expectFileMatchesSnapshotWithCompression('plugins/foo/target/public/foo.plugin.js', 'foo bundle');
+  expectFileMatchesSnapshotWithCompression(
+    'plugins/foo/target/public/1.plugin.js',
+    '1 async bundle'
+  );
+  expectFileMatchesSnapshotWithCompression('plugins/bar/target/public/bar.plugin.js', 'bar bundle');
+});
+
 /**
  * Verifies that the file matches the expected output and has matching compressed variants.
  */

packages/kbn-optimizer/src/optimizer/cache_keys.test.ts

@@ -103,9 +103,7 @@ describe('getOptimizerCacheKey()', () => {
                 "cache": true,
                 "dist": false,
                 "optimizerCacheKey": "♻",
-                "profileWebpack": false,
                 "repoRoot": <absolute path>,
-                "watch": false,
               },
             }
           `);

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

@@ -28,7 +28,7 @@ import stripAnsi from 'strip-ansi';
 
 import jestDiff from 'jest-diff';
 import jsonStable from 'json-stable-stringify';
-import { ascending, WorkerConfig } from '../common';
+import { ascending, CacheableWorkerConfig } from '../common';
 
 import { getMtimes } from './get_mtimes';
 import { getChanges } from './get_changes';
@@ -37,6 +37,16 @@ import { OptimizerConfig } from './optimizer_config';
 const OPTIMIZER_DIR = Path.dirname(require.resolve('../../package.json'));
 const RELATIVE_DIR = Path.relative(REPO_ROOT, OPTIMIZER_DIR);
 
+function omit<T, K extends keyof T>(obj: T, keys: K[]): Omit<T, K> {
+  const result: any = {};
+  for (const [key, value] of Object.entries(obj) as any) {
+    if (!keys.includes(key)) {
+      result[key] = value;
+    }
+  }
+  return result as Omit<T, K>;
+}
+
 export function diffCacheKey(expected?: unknown, actual?: unknown) {
   if (jsonStable(expected) === jsonStable(actual)) {
     return;
@@ -119,7 +129,7 @@ export function reformatJestDiff(diff: string | null) {
 export interface OptimizerCacheKey {
   readonly lastCommit: string | undefined;
   readonly bootstrap: string | undefined;
-  readonly workerConfig: WorkerConfig;
+  readonly workerConfig: CacheableWorkerConfig;
   readonly deletedPaths: string[];
   readonly modifiedTimes: Record<string, number>;
 }
@@ -164,11 +174,11 @@ export async function getOptimizerCacheKey(config: OptimizerConfig) {
   }
 
   const cacheKeys: OptimizerCacheKey = {
-    workerConfig: config.getWorkerConfig('♻'),
     lastCommit,
     bootstrap,
     deletedPaths,
     modifiedTimes: {} as Record<string, number>,
+    workerConfig: omit(config.getWorkerConfig('♻'), ['watch', 'profileWebpack']),
   };
 
   const mtimes = await getMtimes(modifiedPaths);

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

@@ -22,14 +22,12 @@ import { Readable } from 'stream';
 import { inspect } from 'util';
 
 import * as Rx from 'rxjs';
-import { map, filter, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs/operators';
 
-import { isWorkerMsg, isWorkerPing, WorkerConfig, WorkerMsg, Bundle, ParentMsgs } from '../common';
+import { isWorkerMsg, WorkerConfig, WorkerMsg, Bundle } from '../common';
 
 import { OptimizerConfig } from './optimizer_config';
 
-const parentMsgs = new ParentMsgs();
-
 export interface WorkerStdio {
   type: 'worker stdio';
   stream: 'stdout' | 'stderr';
@@ -148,16 +146,6 @@ export function observeWorker(
       observeStdio$(proc.stderr, 'stderr'),
       Rx.fromEvent<[unknown]>(proc, 'message')
         .pipe(
-          // filter out ping messages so they don't end up in the general message stream
-          filter(([msg]) => {
-            if (!isWorkerPing(msg)) {
-              return true;
-            }
-
-            proc.send(parentMsgs.pong());
-            return false;
-          }),
-
           // validate the messages from the process
           map(([msg]) => {
             if (!isWorkerMsg(msg)) {