Fix deadlock starting canvas, core_plugins/interpreter and kbn-interpreter in node 10

.eslintignore

@@ -27,8 +27,7 @@ bower_components
 /x-pack/coverage
 /x-pack/build
 /x-pack/plugins/**/__tests__/fixtures/**
-/packages/kbn-interpreter/common/lib/grammar.js
-/packages/kbn-interpreter/plugin
+/packages/kbn-interpreter/src/common/lib/grammar.js
 /x-pack/plugins/canvas/canvas_plugin
 /x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
 **/*.js.snap

packages/kbn-interpreter/.gitignore

@@ -0,0 +1,4 @@
+common
+plugin
+public
+server

packages/kbn-interpreter/package.json

@@ -2,9 +2,14 @@
   "name": "@kbn/interpreter",
   "version": "1.0.0",
   "license": "Apache-2.0",
+  "main": "./index.js",
   "scripts": {
-    "build": "node tasks/build.js",
+    "build": "babel src --out-dir . --ignore 'src/plugin/**/*' && node tasks/build.js",
     "canvas:peg": "pegjs common/lib/grammar.peg",
     "kbn:bootstrap": "yarn build"
+  },
+  "devDependencies": {
+    "@kbn/babel-preset": "1.0.0",
+    "babel-cli": "^6.26.0"
   }
 }

packages/kbn-interpreter/server/server_registries.js → packages/kbn-interpreter/src/server/server_registries.js

@@ -40,7 +40,6 @@ export const getServerRegistries = () => {
 
 export const populateServerRegistries = types => {
   if (called) {
-    console.log('function should only be called once per process');
     return populatePromise;
   }
   called = true;

packages/kbn-interpreter/tasks/webpack.plugins.js

@@ -19,7 +19,7 @@
 
 const path = require('path');
 
-const sourceDir = path.resolve(__dirname, '../plugin_src');
+const sourceDir = path.resolve(__dirname, '../src/plugin');
 const buildDir = path.resolve(__dirname, '../plugin');
 
 module.exports = {

src/core_plugins/interpreter/init.js

@@ -21,7 +21,7 @@ import { routes } from './server/routes';
 import { functionsRegistry } from '@kbn/interpreter/common/lib/functions_registry';
 import { populateServerRegistries } from '@kbn/interpreter/server/server_registries';
 
-export default function (server /*options*/) {
+export default async function (server /*options*/) {
   server.injectUiAppVars('canvas', () => {
     const config = server.config();
     const basePath = config.get('server.basePath');
@@ -37,5 +37,6 @@ export default function (server /*options*/) {
     };
   });
 
-  populateServerRegistries(['serverFunctions', 'types']).then(() => routes(server));
+  await populateServerRegistries(['serverFunctions', 'types']);
+  routes(server);
 }

src/optimize/base_optimizer.js

@@ -150,8 +150,8 @@ export default class BaseOptimizer {
         },
         {
           test,
-          include: /[\/\\]node_modules[\/\\](x-pack|@kbn[\/\\]interpreter)[\/\\]/,
-          exclude: /[\/\\]node_modules[\/\\](x-pack|@kbn[\/\\]interpreter)[\/\\]node_modules[\/\\]/,
+          include: /[\/\\]node_modules[\/\\]x-pack[\/\\]/,
+          exclude: /[\/\\]node_modules[\/\\]x-pack[\/\\](.+?[\/\\])*node_modules[\/\\]/,
 
         }
       ];

src/setup_node_env/babel_register/register.js

@@ -38,8 +38,11 @@ var ignore = [
   // https://github.com/elastic/kibana/issues/14800#issuecomment-366130268
 
   // ignore paths matching `/node_modules/{a}/{b}`, unless `a`
-  // is `x-pack` or `@kbn/interpreter` and `b` is not `node_modules`
-  /\/node_modules\/(?!(x-pack\/|@kbn\/interpreter\/)(?!node_modules)([^\/]+))([^\/]+\/[^\/]+)/,
+  // is `x-pack` and `b` is not `node_modules`
+  /\/node_modules\/(?!x-pack\/(?!node_modules)([^\/]+))([^\/]+\/[^\/]+)/,
+
+  // ignore paths matching `/kbn-interpreter`
+  /\/kbn-interpreter\//,
 
   // ignore paths matching `/canvas/canvas_plugin/{a}/{b}` unless
   // `a` is `functions` and `b` is `server`

x-pack/plugins/canvas/index.js

@@ -8,7 +8,7 @@ import { resolve } from 'path';
 import { pathsRegistry } from '@kbn/interpreter/common/lib/paths_registry';
 import init from './init';
 import { mappings } from './server/mappings';
-import { CANVAS_APP } from './common/lib/constants';
+import { CANVAS_APP } from './common/lib';
 import { pluginPaths } from './plugin_paths';
 
 export function canvas(kibana) {

x-pack/plugins/canvas/init.js

@@ -5,7 +5,7 @@
  */
 
 import { functionsRegistry } from '@kbn/interpreter/common/lib/functions_registry';
-import { getServerRegistries } from '@kbn/interpreter/server/server_registries';
+import { populateServerRegistries } from '@kbn/interpreter/server/server_registries';
 import { routes } from './server/routes';
 import { commonFunctions } from './common/functions';
 import { registerCanvasUsageCollector } from './server/usage';
@@ -34,6 +34,6 @@ export default async function(server /*options*/) {
   loadSampleData(server);
 
   // Do not initialize the app until the registries are populated
-  await getServerRegistries();
+  await populateServerRegistries(['serverFunctions', 'types']);
   routes(server);
 }