First attempt at server shim

x-pack/legacy/plugins/watcher/plugin_definition.ts

@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resolve } from 'path';
+import { plugin } from './server/np_ready';
+import { ServerShim } from './server/np_ready/plugin';
+import { PLUGIN } from './common/constants';
+
+export const pluginDefinition = {
+  id: PLUGIN.ID,
+  configPrefix: 'xpack.watcher',
+  publicDir: resolve(__dirname, 'public'),
+  require: ['kibana', 'elasticsearch', 'xpack_main'],
+  uiExports: {
+    styleSheetPaths: resolve(__dirname, 'public/np_ready/application/index.scss'),
+    managementSections: ['plugins/watcher/legacy'],
+    home: ['plugins/watcher/register_feature'],
+  },
+  init(server: any) {
+    const serverShim: ServerShim = server as any;
+    plugin({} as any).setup(server.newPlatform.setup.core, {
+      __LEGACY: {
+        route: server.route.bind(server),
+        plugins: {
+          elasticsearch: server.plugins.elasticsearch,
+          [PLUGIN.ID]: server.plugins[PLUGIN.ID],
+          xpack_main: server.plugins.xpack_main,
+        },
+      },
+    });
+  },
+};

x-pack/legacy/plugins/watcher/public/legacy.ts

@@ -54,9 +54,6 @@ routes.when('/management/elasticsearch/watcher/:param1?/:param2?/:param3?/:param
       if (elem) {
         ((unmountApp as unknown) as AppUnmount)();
       }
-      // NOTE: We depend upon Angular's $http service because it's decorated with interceptors,
-      // e.g. to check license status per request.
-      // setHttpClient($http);
 
       $scope.$$postDigest(() => {
         elem = document.getElementById('watchReactRoot')!;
@@ -74,7 +71,7 @@ routes.when('/management/elasticsearch/watcher/:param1?/:param2?/:param3?/:param
 
         instance.start(npStart.core, npStart.plugins);
 
-        unmountApp = mountApp();
+        (mountApp() as Promise<AppUnmount>).then(fn => (unmountApp = fn));
 
         manageAngularLifecycle($scope, $route, elem);
       });

x-pack/legacy/plugins/watcher/public/np_ready/plugin.ts

@@ -12,7 +12,6 @@ import {
   CoreStart,
   ChromeStart,
 } from 'src/core/public';
-import { boot } from './application/boot';
 
 interface LegacyPlugins {
   __LEGACY: {
@@ -32,10 +31,11 @@ export class WatcherUIPlugin implements Plugin<void, void, LegacyPlugins, any> {
     application.register({
       id: 'watcher',
       title: 'Watcher',
-      mount: (ctx, { element }) => {
+      mount: async (ctx, { element }) => {
         const docLinks = this.docLinks!;
         const chrome = this.chrome!;
         const euiUtils = this.euiUtils!;
+        const { boot } = await import('./application/boot');
         return boot({
           ...__LEGACY,
           element,

x-pack/legacy/plugins/watcher/server/np_ready/index.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { PluginInitializerContext } from 'src/core/server';
+import { WatcherServerPlugin } from './plugin';
+
+export const plugin = (ctx: PluginInitializerContext) => new WatcherServerPlugin();

x-pack/legacy/plugins/watcher/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.js → x-pack/legacy/plugins/watcher/server/np_ready/lib/fetch_all_from_scroll/fetch_all_from_scroll.js

@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import { ES_SCROLL_SETTINGS } from '../../../common/constants';
+import { ES_SCROLL_SETTINGS } from '../../../../common/constants';
 
 export function fetchAllFromScroll(response, callWithRequest, hits = []) {
   const newHits = get(response, 'hits.hits', []);

x-pack/legacy/plugins/watcher/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js → x-pack/legacy/plugins/watcher/server/np_ready/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js

@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { licensePreRoutingFactory } from '../license_pre_routing_factory';
-import { LICENSE_STATUS_VALID, LICENSE_STATUS_EXPIRED } from '../../../../../../common/constants/license_status';
+import { LICENSE_STATUS_VALID, LICENSE_STATUS_EXPIRED } from '../../../../../../../common/constants/license_status';
 
 describe('license_pre_routing_factory', () => {
   describe('#reportingFeaturePreRoutingFactory', () => {

x-pack/legacy/plugins/watcher/server/lib/license_pre_routing_factory/license_pre_routing_factory.js → x-pack/legacy/plugins/watcher/server/np_ready/lib/license_pre_routing_factory/license_pre_routing_factory.js

@@ -6,8 +6,8 @@
 
 import { once } from 'lodash';
 import { wrapCustomError } from '../error_wrappers';
-import { PLUGIN } from '../../../common/constants';
-import { LICENSE_STATUS_VALID } from '../../../../../common/constants/license_status';
+import { PLUGIN } from '../../../../common/constants';
+import { LICENSE_STATUS_VALID } from '../../../../../../common/constants/license_status';
 
 export const licensePreRoutingFactory = once((server) => {
   const xpackMainPlugin = server.plugins.xpack_main;

x-pack/legacy/plugins/watcher/server/models/action_status/__tests__/action_status.js → x-pack/legacy/plugins/watcher/server/np_ready/models/action_status/__tests__/action_status.js

@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { ActionStatus } from '../action_status';
-import { ACTION_STATES } from '../../../../common/constants';
+import { ACTION_STATES } from '../../../../../common/constants';
 import moment from 'moment';
 
 describe('action_status', () => {

x-pack/legacy/plugins/watcher/server/models/action_status/action_status.js → x-pack/legacy/plugins/watcher/server/np_ready/models/action_status/action_status.js

@@ -6,8 +6,8 @@
 
 import { get } from 'lodash';
 import { badImplementation, badRequest } from 'boom';
-import { getMoment } from '../../../common/lib/get_moment';
-import { ACTION_STATES } from '../../../common/constants';
+import { getMoment } from '../../../../common/lib/get_moment';
+import { ACTION_STATES } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 
 export class ActionStatus {

x-pack/legacy/plugins/watcher/server/models/settings/settings.js → x-pack/legacy/plugins/watcher/server/np_ready/models/settings/settings.js

@@ -5,7 +5,7 @@
  */
 
 import { merge } from 'lodash';
-import { ACTION_TYPES } from '../../../common/constants';
+import { ACTION_TYPES } from '../../../../common/constants';
 
 function isEnabledByDefault(actionType) {
   switch (actionType) {

x-pack/legacy/plugins/watcher/server/models/watch/base_watch.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/base_watch.js

@@ -6,7 +6,7 @@
 
 import { get, map, pick } from 'lodash';
 import { badRequest } from 'boom';
-import { Action } from '../../../common/models/action';
+import { Action } from '../../../../common/models/action';
 import { WatchStatus } from '../watch_status';
 import { i18n } from '@kbn/i18n';
 import { WatchErrors } from '../watch_errors';

x-pack/legacy/plugins/watcher/server/models/watch/json_watch.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/json_watch.js

@@ -6,8 +6,8 @@
 
 import { isEmpty, cloneDeep, has, merge } from 'lodash';
 import { BaseWatch } from './base_watch';
-import { WATCH_TYPES } from '../../../common/constants';
-import { serializeJsonWatch } from '../../../common/lib/serialization';
+import { WATCH_TYPES } from '../../../../common/constants';
+import { serializeJsonWatch } from '../../../../common/lib/serialization';
 
 export class JsonWatch extends BaseWatch {
   // This constructor should not be used directly.

x-pack/legacy/plugins/watcher/server/models/watch/lib/get_watch_type/get_watch_type.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/lib/get_watch_type/get_watch_type.js

@@ -5,7 +5,7 @@
  */
 
 import { get, contains, values } from 'lodash';
-import { WATCH_TYPES } from '../../../../../common/constants';
+import { WATCH_TYPES } from '../../../../../../common/constants';
 
 export function getWatchType(watchJson) {
   const type = get(watchJson, 'metadata.xpack.type');

x-pack/legacy/plugins/watcher/server/models/watch/monitoring_watch.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/monitoring_watch.js

@@ -7,7 +7,7 @@
 import { merge } from 'lodash';
 import { badRequest } from 'boom';
 import { BaseWatch } from './base_watch';
-import { WATCH_TYPES } from '../../../common/constants';
+import { WATCH_TYPES } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 
 export class MonitoringWatch extends BaseWatch {

x-pack/legacy/plugins/watcher/server/models/watch/threshold_watch/__tests__/format_visualize_data.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/__tests__/format_visualize_data.js

@@ -5,7 +5,7 @@
  */
 
 import expect from '@kbn/expect';
-import { AGG_TYPES } from '../../../../../common/constants';
+import { AGG_TYPES } from '../../../../../../common/constants';
 import { formatVisualizeData } from '../format_visualize_data';
 
 describe('watch', () => {

x-pack/legacy/plugins/watcher/server/models/watch/threshold_watch/build_visualize_query.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/build_visualize_query.js

@@ -5,8 +5,8 @@
  */
 
 import { cloneDeep } from 'lodash';
-import { buildInput } from '../../../../common/lib/serialization';
-import { AGG_TYPES } from '../../../../common/constants';
+import { buildInput } from '../../../../../common/lib/serialization';
+import { AGG_TYPES } from '../../../../../common/constants';
 
 /*
 input.search.request.body.query.bool.filter.range

x-pack/legacy/plugins/watcher/server/models/watch/threshold_watch/format_visualize_data.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/format_visualize_data.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AGG_TYPES } from '../../../../common/constants';
+import { AGG_TYPES } from '../../../../../common/constants';
 
 export function formatVisualizeData({ aggType, termField }, results) {
   if (aggType === AGG_TYPES.COUNT && !Boolean(termField)) {

x-pack/legacy/plugins/watcher/server/models/watch/threshold_watch/threshold_watch.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/threshold_watch.js

@@ -6,8 +6,8 @@
 
 import { merge } from 'lodash';
 import { BaseWatch } from '../base_watch';
-import { WATCH_TYPES, COMPARATORS, SORT_ORDERS } from '../../../../common/constants';
-import { serializeThresholdWatch } from '../../../../common/lib/serialization';
+import { WATCH_TYPES, COMPARATORS, SORT_ORDERS } from '../../../../../common/constants';
+import { serializeThresholdWatch } from '../../../../../common/lib/serialization';
 
 import { buildVisualizeQuery } from './build_visualize_query';
 import { formatVisualizeData } from './format_visualize_data';

x-pack/legacy/plugins/watcher/server/models/watch/threshold_watch/threshold_watch.test.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/threshold_watch/threshold_watch.test.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { COMPARATORS, SORT_ORDERS } from '../../../../common/constants';
+import { COMPARATORS, SORT_ORDERS } from '../../../../../common/constants';
 import { WatchErrors } from '../../watch_errors';
 import { ThresholdWatch } from './threshold_watch';
 

x-pack/legacy/plugins/watcher/server/models/watch/watch.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/watch.js

@@ -6,7 +6,7 @@
 
 import { set } from 'lodash';
 import { badRequest } from 'boom';
-import { WATCH_TYPES } from '../../../common/constants';
+import { WATCH_TYPES } from '../../../../common/constants';
 import { JsonWatch } from './json_watch';
 import { MonitoringWatch } from './monitoring_watch';
 import { ThresholdWatch } from './threshold_watch';

x-pack/legacy/plugins/watcher/server/models/watch/watch.test.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch/watch.test.js

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { WATCH_TYPES } from '../../../common/constants';
+import { WATCH_TYPES } from '../../../../common/constants';
 import { Watch } from './watch';
 import { JsonWatch } from './json_watch';
 import { MonitoringWatch } from './monitoring_watch';

x-pack/legacy/plugins/watcher/server/models/watch_history_item/watch_history_item.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch_history_item/watch_history_item.js

@@ -5,7 +5,7 @@
  */
 
 import { badRequest } from 'boom';
-import { getMoment } from '../../../common/lib/get_moment';
+import { getMoment } from '../../../../common/lib/get_moment';
 import { get, cloneDeep } from 'lodash';
 import { WatchStatus } from '../watch_status';
 import { i18n } from '@kbn/i18n';

x-pack/legacy/plugins/watcher/server/models/watch_status/__tests__/watch_status.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch_status/__tests__/watch_status.js

@@ -6,7 +6,7 @@
 
 import expect from '@kbn/expect';
 import { WatchStatus } from '../watch_status';
-import { ACTION_STATES, WATCH_STATES, WATCH_STATE_COMMENTS } from '../../../../common/constants';
+import { ACTION_STATES, WATCH_STATES, WATCH_STATE_COMMENTS } from '../../../../../common/constants';
 import moment from 'moment';
 
 describe('watch_status', () => {

x-pack/legacy/plugins/watcher/server/models/watch_status/watch_status.js → x-pack/legacy/plugins/watcher/server/np_ready/models/watch_status/watch_status.js

@@ -6,9 +6,9 @@
 
 import { get, map, forEach, max } from 'lodash';
 import { badRequest } from 'boom';
-import { getMoment } from '../../../common/lib/get_moment';
+import { getMoment } from '../../../../common/lib/get_moment';
 import { ActionStatus } from '../action_status';
-import { ACTION_STATES, WATCH_STATES, WATCH_STATE_COMMENTS } from '../../../common/constants';
+import { ACTION_STATES, WATCH_STATES, WATCH_STATE_COMMENTS } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 
 function getActionStatusTotals(watchStatus) {

x-pack/legacy/plugins/watcher/server/np_ready/plugin.ts

@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Plugin, CoreSetup, ElasticsearchServiceSetup } from 'src/core/server';
+import { i18n } from '@kbn/i18n';
+import { XPackMainPlugin } from '../../../xpack_main/xpack_main';
+import { PLUGIN } from '../../common/constants';
+// @ts-ignore
+import { registerFieldsRoutes } from './routes/api/fields';
+// @ts-ignore
+import { registerSettingsRoutes } from './routes/api/settings';
+// @ts-ignore
+import { registerHistoryRoutes } from './routes/api/history';
+// @ts-ignore
+import { registerIndicesRoutes } from './routes/api/indices';
+// @ts-ignore
+import { registerLicenseRoutes } from './routes/api/license';
+// @ts-ignore
+import { registerWatchesRoutes } from './routes/api/watches';
+// @ts-ignore
+import { registerWatchRoutes } from './routes/api/watch';
+import { registerLicenseChecker } from '../../../../server/lib/register_license_checker';
+
+export interface ServerShim {
+  route: any;
+  plugins: {
+    xpack_main: XPackMainPlugin;
+    watcher: any;
+    elasticsearch: ElasticsearchServiceSetup;
+  };
+}
+
+export class WatcherServerPlugin implements Plugin<void, void, any, any> {
+  async setup(core: CoreSetup, { __LEGACY: serverShim }: { __LEGACY: ServerShim }) {
+    // Register license checker
+    registerLicenseChecker(
+      serverShim as any,
+      PLUGIN.ID,
+      PLUGIN.getI18nName(i18n),
+      PLUGIN.MINIMUM_LICENSE_REQUIRED
+    );
+
+    registerFieldsRoutes(serverShim);
+    registerHistoryRoutes(serverShim);
+    registerIndicesRoutes(serverShim);
+    registerLicenseRoutes(serverShim);
+    registerSettingsRoutes(serverShim);
+    registerWatchesRoutes(serverShim);
+    registerWatchRoutes(serverShim);
+  }
+  start() {}
+  stop() {}
+}

x-pack/legacy/plugins/watcher/server/routes/api/history/register_load_route.js → x-pack/legacy/plugins/watcher/server/np_ready/routes/api/history/register_load_route.js

@@ -9,8 +9,8 @@ import { callWithRequestFactory } from '../../../lib/call_with_request_factory';
 import { WatchHistoryItem } from '../../../models/watch_history_item';
 import { isEsErrorFactory } from '../../../lib/is_es_error_factory';
 import { wrapEsError, wrapUnknownError, wrapCustomError } from '../../../lib/error_wrappers';
-import { INDEX_NAMES } from '../../../../common/constants';
-import { licensePreRoutingFactory } from'../../../lib/license_pre_routing_factory';
+import { INDEX_NAMES } from '../../../../../common/constants';
+import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory';
 
 function fetchHistoryItem(callWithRequest, watchHistoryItemId) {
   return callWithRequest('search', {