Pollux #7218 Upgrade vega & vega-lite (#49)

refs #7218
optimdata · Oct 13, 2021 · 306a6b1 · 306a6b1
1 parent e07ea03
commit 306a6b1
Show file tree

Hide file tree

Showing 7 changed files with 649 additions and 311 deletions.
diff --git a/package.json b/package.json
@@ -250,10 +250,10 @@
     "uuid": "3.0.1",
     "val-loader": "^1.1.1",
     "validate-npm-package-name": "2.2.2",
-    "vega-lib": "^3.3.1",
-    "vega-lite": "^2.4.0",
+    "vega": "^5.20.2",
+    "vega-lite": "5.1.0",
     "vega-schema-url-parser": "1.0.0",
-    "vega-tooltip": "^0.9.14",
+    "vega-tooltip": "^0.19.1",
     "vision": "^5.3.3",
     "webpack": "4.23.1",
     "webpack-merge": "4.1.4",

diff --git a/src/legacy/core_plugins/vega/public/data_model/vega_parser.js b/src/legacy/core_plugins/vega/public/data_model/vega_parser.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import * as vega from 'vega-lib';
+import * as vega from 'vega';
 import * as vegaLite from 'vega-lite';
 import schemaParser from 'vega-schema-url-parser';
 import versionCompare from 'compare-versions';

diff --git a/src/legacy/core_plugins/vega/public/vega_view/vega_base_view.js b/src/legacy/core_plugins/vega/public/vega_view/vega_base_view.js
@@ -20,7 +20,7 @@
 import $ from 'jquery';
 import moment from 'moment';
 import dateMath from '@elastic/datemath';
-import * as vega from 'vega-lib';
+import * as vega from 'vega';
 import * as vegaLite from 'vega-lite';
 import { Utils } from '../data_model/utils';
 import { VISUALIZATION_COLORS } from '@elastic/eui';

diff --git a/src/legacy/core_plugins/vega/public/vega_view/vega_map_view.js b/src/legacy/core_plugins/vega/public/vega_view/vega_map_view.js
@@ -18,7 +18,7 @@
  */
 
 import { KibanaMap } from 'ui/vis/map/kibana_map';
-import * as vega from 'vega-lib';
+import * as vega from 'vega';
 import { VegaBaseView } from './vega_base_view';
 import { VegaMapLayer } from './vega_map_layer';
 import { i18n }  from '@kbn/i18n';

diff --git a/src/legacy/core_plugins/vega/public/vega_view/vega_view.js b/src/legacy/core_plugins/vega/public/vega_view/vega_view.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import * as vega from 'vega-lib';
+import * as vega from 'vega';
 import { VegaBaseView } from './vega_base_view';
 
 export class VegaView extends VegaBaseView {

diff --git a/src/optimize/dynamic_dll_plugin/dll_config_model.js b/src/optimize/dynamic_dll_plugin/dll_config_model.js
@@ -74,6 +74,10 @@ function generateDLL(config) {
               test: /\.js$/,
               exclude: BABEL_EXCLUDE_RE.concat(dllNoParseRules),
             },
+            {
+              test: /\.js$/,
+              include: /[\/\\]node_modules[\/\\]vega-lite[\/\\]/,
+            },
             {
               test: /\.js$/,
               include: /[\/\\]node_modules[\/\\]x-pack[\/\\]/,