From 858a1e265c318260917d9ba7ebf1154034f654dd Mon Sep 17 00:00:00 2001 From: Christopher Davies Date: Mon, 9 Sep 2019 10:34:33 -0400 Subject: [PATCH] Move ExpressionRenderer to setup instead of start, so that embeddables can rely on it without starting their plugins. --- .../data/public/expressions/expressions_service.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/legacy/core_plugins/data/public/expressions/expressions_service.ts b/src/legacy/core_plugins/data/public/expressions/expressions_service.ts index a00512f04c1ac..7940f8f55497c 100644 --- a/src/legacy/core_plugins/data/public/expressions/expressions_service.ts +++ b/src/legacy/core_plugins/data/public/expressions/expressions_service.ts @@ -39,6 +39,7 @@ export class ExpressionsService { public setup() { // eslint-disable-next-line const { getInterpreter } = require('../../../interpreter/public/interpreter'); + getInterpreter() .then(setInterpreter) .catch((e: Error) => { @@ -49,19 +50,17 @@ export class ExpressionsService { registerType: npSetup.plugins.data.expressions.registerType, registerFunction: npSetup.plugins.data.expressions.registerFunction, registerRenderer: npSetup.plugins.data.expressions.registerRenderer, + ExpressionRenderer: createRenderer(loader), }; } public start({ inspector }: ExpressionsServiceStartDependencies) { - const ExpressionRenderer = createRenderer(loader); setInspector(inspector); return { execute, render, loader, - - ExpressionRenderer, }; }