From f5dc38fd358753195d7b3685c82f5d1326e11c62 Mon Sep 17 00:00:00 2001 From: Beau Gunderson Date: Thu, 16 Mar 2017 13:29:27 -0700 Subject: [PATCH] fixes for kibana 5.x --- package.json | 12 +++++++++++- public/html-formatter.js | 14 ++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 803e4d6..eb665e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "html-formatter", - "version": "1.1.0", + "version": "5.2.2", "description": "An HTML field formatter for Kibana", "main": "index.js", "scripts": { @@ -17,5 +17,15 @@ "eslint": "3.7.1", "eslint-plugin-mocha": "4.6.0", "@elastic/plugin-helpers": "5.0.0-beta2" + }, + "dependencies": { + "babel": "^5.8.34", + "babel-core": "^5.8.38", + "babel-loader": "^5.0.0", + "css-loader": "^0.27.3", + "less": "^2.7.2", + "less-loader": "^3.0.0", + "postcss-loader": "^1.3.3", + "rjs-repack-loader": "^1.0.6" } } diff --git a/public/html-formatter.js b/public/html-formatter.js index 980ef73..278b079 100644 --- a/public/html-formatter.js +++ b/public/html-formatter.js @@ -1,8 +1,12 @@ -require('plugins/html-formatter/less/main.less'); +import _ from 'lodash'; + +import RegistryFieldFormatsProvider from 'ui/registry/field_formats'; +import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/field_format'; + +import './less/main.less'; function HTMLFormatProvider(Private) { - var _ = require('lodash'); - var FieldFormat = Private(require('ui/index_patterns/_field_format/FieldFormat')); + var FieldFormat = Private(IndexPatternsFieldFormatProvider); _.class(HTML).inherits(FieldFormat); @@ -26,4 +30,6 @@ function HTMLFormatProvider(Private) { return HTML; } -require('ui/registry/field_formats').register(HTMLFormatProvider); +RegistryFieldFormatsProvider.register(HTMLFormatProvider); + +export default HTMLFormatProvider;