[NP] Vega migration

.i18nrc.json

@@ -51,7 +51,7 @@
     "visTypeTable": "src/plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
-    "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
+    "visTypeVega": "src/plugins/vis_type_vega",
     "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
     "visTypeXy": "src/legacy/core_plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",

packages/kbn-optimizer/src/worker/webpack.config.ts

@@ -289,6 +289,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
 
     resolve: {
       extensions: ['.js', '.ts', '.tsx', '.json'],
+      mainFields: ['browser', 'main'],
       alias: {
         tinymath: require.resolve('tinymath/lib/tinymath.es5.js'),
       },

src/legacy/core_plugins/vis_type_vega/public/__tests__/vega_visualization.js → src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js

@@ -21,7 +21,9 @@ import Bluebird from 'bluebird';
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import $ from 'jquery';
-import { createVegaVisualization } from '../vega_visualization';
+// Will be replaced with new path when tests are moved
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createVegaVisualization } from '../../../../../../plugins/vis_type_vega/public/vega_visualization';
 import { ImageComparator } from 'test_utils/image_comparator';
 
 import vegaliteGraph from '!!raw-loader!./vegalite_graph.hjson';
@@ -35,24 +37,34 @@ import vegaTooltipGraph from '!!raw-loader!./vega_tooltip_test.hjson';
 
 import vegaMapGraph from '!!raw-loader!./vega_map_test.hjson';
 import vegaMapImage256 from './vega_map_image_256.png';
+// Will be replaced with new path when tests are moved
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { VegaParser } from '../../../../../../plugins/vis_type_vega/public/data_model/vega_parser';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { SearchCache } from '../../../../../../plugins/vis_type_vega/public/data_model/search_cache';
 
-import { VegaParser } from '../data_model/vega_parser';
-import { SearchCache } from '../data_model/search_cache';
-
-import { createVegaTypeDefinition } from '../vega_type';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { createVegaTypeDefinition } from '../../../../../../plugins/vis_type_vega/public/vega_type';
 // TODO This is an integration test and thus requires a running platform. When moving to the new platform,
 // this test has to be migrated to the newly created integration test environment.
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { npStart } from 'ui/new_platform';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { BaseVisType } from '../../../../../plugins/visualizations/public/vis_types/base_vis_type';
+import { BaseVisType } from '../../../../../../plugins/visualizations/public/vis_types/base_vis_type';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ExprVis } from '../../../../../plugins/visualizations/public/expressions/vis';
-import { setInjectedVars } from '../services';
+import { ExprVis } from '../../../../../../plugins/visualizations/public/expressions/vis';
+
+import {
+  setInjectedVars,
+  setData,
+  setSavedObjects,
+  setNotifications,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../plugins/vis_type_vega/public/services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
+import { setInjectedVarFunc } from '../../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
+import { ServiceSettings } from '../../../../../../plugins/maps_legacy/public/map/service_settings';
 
 const THRESHOLD = 0.1;
 const PIXEL_DIFF = 30;
@@ -70,6 +82,9 @@ describe('VegaVisualizations', () => {
     enableExternalUrls: true,
     esShardTimeout: 10000,
   });
+  setData(npStart.plugins.data);
+  setSavedObjects(npStart.core.savedObjects);
+  setNotifications(npStart.core.notifications);
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(
@@ -111,9 +126,6 @@ describe('VegaVisualizations', () => {
                 timefilter: {},
               },
             },
-            __LEGACY: {
-              esClient: npStart.plugins.data.search.__LEGACY.esClient,
-            },
           },
         },
       };

src/legacy/ui/public/new_platform/new_platform.ts

@@ -59,7 +59,6 @@ import {
   NavigationPublicPluginSetup,
   NavigationPublicPluginStart,
 } from '../../../../plugins/navigation/public';
-import { VisTypeVegaSetup } from '../../../../plugins/vis_type_vega/public';
 import { DiscoverSetup, DiscoverStart } from '../../../../plugins/discover/public';
 import {
   SavedObjectsManagementPluginSetup,
@@ -88,7 +87,6 @@ export interface PluginsSetup {
   usageCollection: UsageCollectionSetup;
   advancedSettings: AdvancedSettingsSetup;
   management: ManagementSetup;
-  visTypeVega: VisTypeVegaSetup;
   discover: DiscoverSetup;
   visualizations: VisualizationsSetup;
   telemetry?: TelemetryPluginSetup;

src/plugins/vis_type_vega/kibana.json

@@ -2,5 +2,6 @@
   "id": "visTypeVega",
   "version": "kibana",
   "server": true,
-  "ui": true
+  "ui": true,
+  "requiredPlugins": ["data", "visualizations", "mapsLegacy", "expressions"]
 }

src/legacy/core_plugins/vis_type_vega/public/__mocks__/services.ts → src/plugins/vis_type_vega/public/__mocks__/services.ts

@@ -17,11 +17,11 @@
  * under the License.
  */
 
-import { createGetterSetter } from '../../../../../plugins/kibana_utils/public';
-import { DataPublicPluginStart } from '../../../../../plugins/data/public';
+import { createGetterSetter } from '../../../kibana_utils/public';
+import { DataPublicPluginStart } from '../../../data/public';
 import { IUiSettingsClient, NotificationsStart, SavedObjectsStart } from 'kibana/public';
-import { dataPluginMock } from '../../../../../plugins/data/public/mocks';
-import { coreMock } from '../../../../../core/public/mocks';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { coreMock } from '../../../../core/public/mocks';
 
 export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
 setData(dataPluginMock.createStartContract());

src/legacy/core_plugins/vis_type_vega/public/index.scss → src/plugins/vis_type_vega/public/index.scss

@@ -1,5 +1,3 @@
-@import 'src/legacy/ui/public/styles/styling_constants';
-
 // Prefix all styles with "vga" to avoid conflicts.
 // Examples
 //   vgaChart

src/plugins/vis_type_vega/public/index.ts

@@ -19,20 +19,8 @@
 
 import { PluginInitializerContext } from 'kibana/public';
 import { ConfigSchema } from '../config';
+import { VegaPlugin as Plugin } from './plugin';
 
-export const plugin = (initializerContext: PluginInitializerContext<ConfigSchema>) => ({
-  setup() {
-    return {
-      /**
-       * The configuration is temporarily exposed to allow the legacy vega plugin to consume
-       * the setting. Once the vega plugin is migrated completely, this will become an implementation
-       * detail.
-       * @deprecated
-       */
-      config: initializerContext.config.get(),
-    };
-  },
-  start() {},
-});
-
-export type VisTypeVegaSetup = ReturnType<ReturnType<typeof plugin>['setup']>;
+export function plugin(initializerContext: PluginInitializerContext<ConfigSchema>) {
+  return new Plugin(initializerContext);
+}

src/legacy/core_plugins/vis_type_vega/public/plugin.ts → src/plugins/vis_type_vega/public/plugin.ts

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import { Plugin as DataPublicPlugin } from '../../../../plugins/data/public';
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
+import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../../core/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { Plugin as DataPublicPlugin } from '../../data/public';
+import { VisualizationsSetup } from '../../visualizations/public';
 import {
   setNotifications,
   setData,
@@ -30,8 +30,10 @@ import {
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
-import { VisTypeVegaSetup } from '../../../../plugins/vis_type_vega/public';
-import { IServiceSettings } from '../../../../plugins/maps_legacy/public';
+import { IServiceSettings } from '../../maps_legacy/public';
+import { ConfigSchema } from '../config';
+
+import './index.scss';
 
 /** @internal */
 export interface VegaVisualizationDependencies {
@@ -47,7 +49,6 @@ export interface VegaPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
   data: ReturnType<DataPublicPlugin['setup']>;
-  visTypeVega: VisTypeVegaSetup;
   mapsLegacy: any;
 }
 
@@ -58,18 +59,18 @@ export interface VegaPluginStartDependencies {
 
 /** @internal */
 export class VegaPlugin implements Plugin<Promise<void>, void> {
-  initializerContext: PluginInitializerContext;
+  initializerContext: PluginInitializerContext<ConfigSchema>;
 
-  constructor(initializerContext: PluginInitializerContext) {
+  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
     this.initializerContext = initializerContext;
   }
 
   public async setup(
     core: CoreSetup,
-    { data, expressions, visualizations, visTypeVega, mapsLegacy }: VegaPluginSetupDependencies
+    { data, expressions, visualizations, mapsLegacy }: VegaPluginSetupDependencies
   ) {
     setInjectedVars({
-      enableExternalUrls: visTypeVega.config.enableExternalUrls,
+      enableExternalUrls: this.initializerContext.config.get().enableExternalUrls,
       esShardTimeout: core.injectedMetadata.getInjectedVar('esShardTimeout') as number,
       emsTileLayerId: core.injectedMetadata.getInjectedVar('emsTileLayerId', true),
     });

src/legacy/core_plugins/vis_type_vega/public/services.ts → src/plugins/vis_type_vega/public/services.ts

@@ -18,10 +18,9 @@
  */
 
 import { SavedObjectsStart } from 'kibana/public';
-import { NotificationsStart } from 'src/core/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
-import { createGetterSetter } from '../../../../plugins/kibana_utils/public';
-import { IUiSettingsClient } from '../../../../core/public';
+import { NotificationsStart, IUiSettingsClient } from 'src/core/public';
+import { DataPublicPluginStart } from '../../data/public';
+import { createGetterSetter } from '../../kibana_utils/public';
 
 export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
 

src/legacy/core_plugins/vis_type_vega/public/vega_fn.ts → src/plugins/vis_type_vega/public/vega_fn.ts

@@ -19,11 +19,7 @@
 
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import {
-  ExpressionFunctionDefinition,
-  KibanaContext,
-  Render,
-} from '../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition, KibanaContext, Render } from '../../expressions/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { createVegaRequestHandler } from './vega_request_handler';