Merge branch 'master' into jira-is-gold

.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/**/*',

package.json

@@ -121,6 +121,7 @@
   },
   "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",

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/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/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/worker/observe_parent_offline.test.ts

@@ -75,18 +75,6 @@ async function waitForTick() {
 }
 
 describe('emits and completes when parent exists because:', () => {
-  test('"disconnect" event', async () => {
-    const mockProc = new MockProcess();
-    const promise = record(observeParentOffline(mockProc, workerMsgs));
-    mockProc.emit('disconnect');
-    expect(await promise).toMatchInlineSnapshot(`
-      Array [
-        "next: 'parent offline (disconnect event)'",
-        "complete",
-      ]
-    `);
-  });
-
   test('process.connected is false', async () => {
     const mockProc = new MockProcess({
       connected: false,

packages/kbn-optimizer/src/worker/observe_parent_offline.ts

@@ -44,35 +44,28 @@ export interface Process extends EventEmitter {
  *     call errored with an 'ERR_IPC_CHANNEL_CLOSED' exception
  */
 export function observeParentOffline(process: Process, workerMsgs: WorkerMsgs) {
-  return Rx.race(
-    Rx.fromEvent(process, 'disconnect').pipe(
-      take(1),
-      map(() => 'parent offline (disconnect event)')
-    ),
+  return sleep(5000).pipe(
+    mergeMap(() => {
+      if (!process.connected || !process.send) {
+        return Rx.of('parent offline (disconnected)');
+      }
 
-    sleep(5000).pipe(
-      mergeMap(() => {
-        if (!process.connected || !process.send) {
-          return Rx.of('parent offline (disconnected)');
-        }
+      process.send(workerMsgs.ping());
 
-        process.send(workerMsgs.ping());
+      const pong$ = Rx.fromEvent<[any]>(process, 'message').pipe(
+        first(([msg]) => isParentPong(msg)),
+        map(() => {
+          throw new Error('parent still online');
+        })
+      );
 
-        const pong$ = Rx.fromEvent<[any]>(process, 'message').pipe(
-          first(([msg]) => isParentPong(msg)),
-          map(() => {
-            throw new Error('parent still online');
-          })
-        );
+      // give the parent some time to respond, if the ping
+      // wins the race the parent is considered online
+      const timeout$ = sleep(5000).pipe(map(() => 'parent offline (ping timeout)'));
 
-        // give the parent some time to respond, if the ping
-        // wins the race the parent is considered online
-        const timeout$ = sleep(5000).pipe(map(() => 'parent offline (ping timeout)'));
+      return Rx.race(pong$, timeout$);
+    }),
 
-        return Rx.race(pong$, timeout$);
-      })
-    )
-  ).pipe(
     /**
      * resubscribe to the source observable (triggering the timer,
      * ping, wait for response) if the source observable does not

src/legacy/core_plugins/timelion/public/app.js

@@ -23,6 +23,7 @@ import 'angular-sanitize';
 
 import { i18n } from '@kbn/i18n';
 
+import routes from 'ui/routes';
 import { capabilities } from 'ui/capabilities';
 import { docTitle } from 'ui/doc_title';
 import { fatalError, toastNotifications } from 'ui/notify';
@@ -62,9 +63,9 @@ document.title = 'Timelion - Kibana';
 
 const app = require('ui/modules').get('apps/timelion', ['i18n', 'ngSanitize']);
 
-require('ui/routes').enable();
+routes.enable();
 
-require('ui/routes').when('/:id?', {
+routes.when('/:id?', {
   template: rootTemplate,
   reloadOnSearch: false,
   k7Breadcrumbs: ($injector, $route) =>

src/optimize/base_optimizer.js

@@ -49,6 +49,10 @@ const STATS_WARNINGS_FILTER = new RegExp(
 );
 const IS_CODE_COVERAGE = !!process.env.CODE_COVERAGE;
 
+const LEGACY_PRESETS = {
+  plugins: [require.resolve('@babel/plugin-transform-modules-commonjs')],
+};
+
 function recursiveIssuer(m) {
   if (m.issuer) {
     return recursiveIssuer(m.issuer);
@@ -123,7 +127,7 @@ export default class BaseOptimizer {
   }
 
   warmupThreadLoaderPool() {
-    const baseModules = ['babel-loader', BABEL_PRESET_PATH];
+    const baseModules = ['babel-loader', BABEL_PRESET_PATH, LEGACY_PRESETS];
 
     threadLoader.warmup(
       // pool options, like passed to loader options
@@ -522,6 +526,8 @@ export default class BaseOptimizer {
   }
 
   getPresets() {
-    return IS_CODE_COVERAGE ? [ISTANBUL_PRESET_PATH, BABEL_PRESET_PATH] : [BABEL_PRESET_PATH];
+    return IS_CODE_COVERAGE
+      ? [ISTANBUL_PRESET_PATH, BABEL_PRESET_PATH, LEGACY_PRESETS]
+      : [BABEL_PRESET_PATH, LEGACY_PRESETS];
   }
 }

src/optimize/create_ui_exports_module.js

@@ -22,7 +22,7 @@ function normalizePath(path) {
   return path.replace(/[\\\/]+/g, '/');
 }
 
-export default function() {
+module.exports = function() {
   if (!module.id.includes('?')) {
     throw new Error('create_ui_exports_module loaded without JSON args in module.id');
   }
@@ -37,4 +37,4 @@ export default function() {
   return {
     code: `${comment}\n${requires}\n`,
   };
-}
+};

src/plugins/apm_oss/server/index.ts

@@ -44,6 +44,8 @@ export { APMOSSPluginSetup } from './plugin';
 
 export { apmIndexPattern };
 
+export { APM_STATIC_INDEX_PATTERN_ID } from '../common/index_pattern_constants';
+
 export {
   createNodeAgentInstructions,
   createDjangoAgentInstructions,

src/plugins/discover/public/application/angular/context_app.js

@@ -36,9 +36,7 @@ import {
 } from './context/query';
 import { callAfterBindingsWorkaround } from './context/helpers/call_after_bindings_workaround';
 
-const module = getAngularModule();
-
-module.directive('contextApp', function ContextApp() {
+getAngularModule().directive('contextApp', function ContextApp() {
   return {
     bindToController: true,
     controller: callAfterBindingsWorkaround(ContextAppController),