[Shared UX] Adoption of Shared UX Route component

.eslintrc.js

@@ -249,6 +249,11 @@ const RESTRICTED_IMPORTS = [
     name: 'react-use',
     message: 'Please use react-use/lib/{method} instead.',
   },
+  {
+    name: 'react-router-dom',
+    importNames: ['Route'],
+    message: 'Please use @kbn/shared-ux-router instead',
+  },
 ];
 
 module.exports = {

examples/bfetch_explorer/public/containers/app/index.tsx

@@ -7,7 +7,8 @@
  */
 
 import React from 'react';
-import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
+import { BrowserRouter as Router, Redirect, Switch } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { EuiPage } from '@elastic/eui';
 import { useDeps } from '../../hooks/use_deps';
 import { Sidebar } from './sidebar';

examples/bfetch_explorer/tsconfig.json

@@ -18,5 +18,6 @@
     "@kbn/developer-examples-plugin",
     "@kbn/bfetch-plugin",
     "@kbn/kibana-react-plugin",
+    "@kbn/shared-ux-router",
   ]
 }

examples/embeddable_explorer/public/app.tsx

@@ -8,8 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { BrowserRouter as Router, Route, withRouter, RouteComponentProps } from 'react-router-dom';
-
+import { BrowserRouter as Router, withRouter, RouteComponentProps } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { EuiPage, EuiPageSideBar_Deprecated as EuiPageSideBar, EuiSideNav } from '@elastic/eui';
 
 import { EmbeddableStart } from '@kbn/embeddable-plugin/public';

examples/embeddable_explorer/tsconfig.json

@@ -20,5 +20,6 @@
     "@kbn/inspector-plugin",
     "@kbn/embeddable-examples-plugin",
     "@kbn/developer-examples-plugin",
+    "@kbn/shared-ux-router",
   ]
 }

examples/guided_onboarding_example/public/components/app.tsx

@@ -8,7 +8,8 @@
 
 import React from 'react';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n-react';
-import { Router, Switch, Route } from 'react-router-dom';
+import { Router, Switch } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 
 import {
   EuiPage,

examples/guided_onboarding_example/tsconfig.json

@@ -16,6 +16,7 @@
     "@kbn/i18n-react",
     "@kbn/i18n",
     "@kbn/guided-onboarding",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

examples/locator_examples/public/app.tsx

@@ -12,7 +12,8 @@ import ReactDOM from 'react-dom';
 import { EuiPageBody } from '@elastic/eui';
 import { EuiPageContent_Deprecated as EuiPageContent } from '@elastic/eui';
 import { EuiPageContentBody_Deprecated as EuiPageContentBody } from '@elastic/eui';
-import { Route, Switch, Redirect, Router, useLocation } from 'react-router-dom';
+import { Switch, Redirect, Router, useLocation } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { createBrowserHistory } from 'history';
 import { EuiText } from '@elastic/eui';
 import { AppMountParameters } from '@kbn/core/public';

examples/locator_examples/tsconfig.json

@@ -18,5 +18,6 @@
     "@kbn/share-plugin",
     "@kbn/utility-types",
     "@kbn/kibana-utils-plugin",
+    "@kbn/shared-ux-router",
   ]
 }

examples/response_stream/public/containers/app/index.tsx

@@ -7,7 +7,8 @@
  */
 
 import React from 'react';
-import { BrowserRouter as Router, Route, Redirect, Switch } from 'react-router-dom';
+import { BrowserRouter as Router, Redirect, Switch } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { EuiPage } from '@elastic/eui';
 import { useDeps } from '../../hooks/use_deps';
 import { Sidebar } from './sidebar';

examples/response_stream/tsconfig.json

@@ -21,5 +21,6 @@
     "@kbn/kibana-react-plugin",
     "@kbn/aiops-utils",
     "@kbn/config-schema",
+    "@kbn/shared-ux-router",
   ]
 }

examples/search_examples/public/application.tsx

@@ -8,7 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Route, Redirect } from 'react-router-dom';
+import { Router, Redirect } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { I18nProvider } from '@kbn/i18n-react';
 import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';

examples/search_examples/tsconfig.json

@@ -31,5 +31,6 @@
     "@kbn/i18n",
     "@kbn/core-mount-utils-browser-internal",
     "@kbn/config-schema",
+    "@kbn/shared-ux-router",
   ]
 }

examples/state_containers_examples/public/todo/todo.tsx

@@ -7,7 +7,8 @@
  */
 
 import React, { useEffect, useMemo } from 'react';
-import { Link, Route, Router, Switch, useLocation } from 'react-router-dom';
+import { Link, Router, Switch, useLocation } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { History } from 'history';
 import {
   EuiButton,

examples/state_containers_examples/tsconfig.json

@@ -22,5 +22,6 @@
     "@kbn/data-views-plugin",
     "@kbn/developer-examples-plugin",
     "@kbn/es-query",
+    "@kbn/shared-ux-router",
   ]
 }

packages/core/application/core-application-browser-internal/src/ui/app_router.tsx

@@ -7,7 +7,8 @@
  */
 
 import React, { FunctionComponent, useMemo } from 'react';
-import { Route, RouteComponentProps, Router, Switch } from 'react-router-dom';
+// eslint-disable-next-line no-restricted-imports
+import { RouteComponentProps, Router, Route, Switch } from 'react-router-dom';
 import { History } from 'history';
 import { EMPTY, Observable } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';

packages/kbn-test-jest-helpers/src/router_helpers.tsx

@@ -7,7 +7,8 @@
  */
 
 import React, { Component, ComponentType } from 'react';
-import { MemoryRouter, Route, withRouter } from 'react-router-dom';
+import { MemoryRouter, withRouter } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { History, LocationDescriptor } from 'history';
 
 const stringifyPath = (path: LocationDescriptor): string => {

packages/kbn-test-jest-helpers/tsconfig.json

@@ -11,6 +11,7 @@
   "kbn_references": [
     "@kbn/i18n-react",
     "@kbn/axe-config",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

packages/shared-ux/router/impl/router.tsx

@@ -8,6 +8,7 @@
 
 import React, { useMemo } from 'react';
 import {
+  // eslint-disable-next-line no-restricted-imports
   Route as ReactRouterRoute,
   RouteComponentProps,
   RouteProps,

src/plugins/advanced_settings/public/management_app/mount_management_section.tsx

@@ -8,7 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Switch, Route, Redirect, RouteChildrenProps } from 'react-router-dom';
+import { Router, Switch, Redirect, RouteChildrenProps } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';

src/plugins/advanced_settings/tsconfig.json

@@ -20,6 +20,7 @@
     "@kbn/i18n-react",
     "@kbn/expect",
     "@kbn/monaco",
+    "@kbn/shared-ux-router",
     "@kbn/core-ui-settings-browser-mocks",
     "@kbn/core-application-browser",
     "@kbn/core-ui-settings-browser",

src/plugins/dashboard/public/dashboard_app/dashboard_router.tsx

@@ -12,7 +12,8 @@ import React from 'react';
 import { History } from 'history';
 import { parse, ParsedQuery } from 'query-string';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { Switch, Route, RouteComponentProps, HashRouter, Redirect } from 'react-router-dom';
+import { Switch, RouteComponentProps, HashRouter, Redirect } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 
 import {
   TableListViewKibanaDependencies,

src/plugins/dashboard/tsconfig.json

@@ -52,6 +52,7 @@
     "@kbn/task-manager-plugin",
     "@kbn/core-execution-context-common",
     "@kbn/core-custom-branding-browser",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/data_view_management/public/management_app/mount_management_section.tsx

@@ -8,7 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Switch, Route, Redirect } from 'react-router-dom';
+import { Router, Switch, Redirect } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';

src/plugins/data_view_management/tsconfig.json

@@ -32,6 +32,7 @@
     "@kbn/shared-ux-link-redirect-app",
     "@kbn/utility-types-jest",
     "@kbn/config-schema",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/dev_tools/public/application.tsx

@@ -9,13 +9,8 @@
 import React, { useEffect, useRef } from 'react';
 import { Observable } from 'rxjs';
 import ReactDOM from 'react-dom';
-import {
-  HashRouter as Router,
-  Switch,
-  Route,
-  Redirect,
-  RouteComponentProps,
-} from 'react-router-dom';
+import { HashRouter as Router, Switch, Redirect, RouteComponentProps } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { EuiTab, EuiTabs, EuiToolTip, EuiBetaBadge } from '@elastic/eui';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
@@ -28,7 +23,7 @@ import type {
   CoreTheme,
   ExecutionContextStart,
 } from '@kbn/core/public';
-import { KibanaThemeProvider, useExecutionContext } from '@kbn/kibana-react-plugin/public';
+import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { DocTitleService, BreadcrumbService } from './services';
 
 import { DevToolApp } from './dev_tool';
@@ -79,11 +74,6 @@ function DevToolsWrapper({
     breadcrumbService.setBreadcrumbs(activeDevTool.title);
   }, [activeDevTool, docTitleService, breadcrumbService]);
 
-  useExecutionContext(appServices.executionContext, {
-    type: 'application',
-    page: activeDevTool.id,
-  });
-
   return (
     <main className="devApp">
       <EuiTabs style={{ paddingLeft: euiThemeVars.euiSizeS }} size="l">

src/plugins/dev_tools/tsconfig.json

@@ -12,6 +12,7 @@
     "@kbn/i18n",
     "@kbn/ui-theme",
     "@kbn/kibana-react-plugin",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/discover/public/application/discover_router.test.tsx

@@ -7,7 +7,8 @@
  */
 import React from 'react';
 import { shallow } from 'enzyme';
-import { Route, RouteProps } from 'react-router-dom';
+import { RouteProps } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { createSearchSessionMock } from '../__mocks__/search_session';
 import { discoverServiceMock as mockDiscoverServices } from '../__mocks__/services';
 import { discoverRouter } from './discover_router';

src/plugins/discover/public/application/discover_router.tsx

@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { Redirect, Route, Router, Switch } from 'react-router-dom';
+import { Redirect, Router, Switch } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import React from 'react';
 import { History } from 'history';
 import { EuiErrorBoundary } from '@elastic/eui';

src/plugins/discover/tsconfig.json

@@ -52,6 +52,7 @@
     "@kbn/rison",
     "@kbn/config-schema",
     "@kbn/storybook",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/files_management/public/mount_management_section.tsx

@@ -8,7 +8,8 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Route } from 'react-router-dom';
+import { Router } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { I18nProvider, FormattedRelative } from '@kbn/i18n-react';
 import type { CoreStart } from '@kbn/core/public';

src/plugins/files_management/tsconfig.json

@@ -13,6 +13,7 @@
     "@kbn/kibana-react-plugin",
     "@kbn/i18n-react",
     "@kbn/shared-ux-file-image",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/home/public/application/components/home_app.js

@@ -12,6 +12,7 @@ import PropTypes from 'prop-types';
 import { Home } from './home';
 import { TutorialDirectory } from './tutorial_directory';
 import { Tutorial } from './tutorial/tutorial';
+// eslint-disable-next-line no-restricted-imports
 import { HashRouter as Router, Switch, Route, Redirect } from 'react-router-dom';
 import { getTutorial } from '../load_tutorials';
 import { replaceTemplateStrings } from './tutorial/replace_template_strings';

src/plugins/kibana_overview/public/components/app.tsx

@@ -9,7 +9,8 @@
 import React, { useEffect, useState } from 'react';
 import { Observable } from 'rxjs';
 import { I18nProvider } from '@kbn/i18n-react';
-import { HashRouter as Router, Switch, Route } from 'react-router-dom';
+import { HashRouter as Router, Switch } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { CoreStart } from '@kbn/core/public';
 import { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import { FetchResult } from '@kbn/newsfeed-plugin/public';

src/plugins/kibana_overview/tsconfig.json

@@ -25,6 +25,7 @@
     "@kbn/shared-ux-page-analytics-no-data",
     "@kbn/shared-ux-avatar-solution",
     "@kbn/shared-ux-link-redirect-app",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/kibana_react/public/router/router.tsx

@@ -8,6 +8,7 @@
 
 import React, { useMemo } from 'react';
 import {
+  // eslint-disable-next-line no-restricted-imports
   Route as ReactRouterRoute,
   RouteComponentProps,
   RouteProps,

src/plugins/management/public/components/management_app/management_router.tsx

@@ -7,7 +7,8 @@
  */
 
 import React, { memo } from 'react';
-import { Route, Router, Switch, Redirect } from 'react-router-dom';
+import { Router, Switch, Redirect } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
 import { ManagementAppWrapper } from '../management_app_wrapper';
 import { ManagementLandingPage } from '../landing';

src/plugins/management/tsconfig.json

@@ -19,6 +19,7 @@
     "@kbn/i18n",
     "@kbn/i18n-react",
     "@kbn/shared-ux-page-kibana-template",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/saved_objects_management/public/management_section/mount_section.tsx

@@ -8,7 +8,8 @@
 
 import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
-import { Router, Switch, Route } from 'react-router-dom';
+import { Router, Switch } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';

src/plugins/saved_objects_management/tsconfig.json

@@ -26,6 +26,7 @@
     "@kbn/config-schema",
     "@kbn/core-custom-branding-browser-mocks",
     "@kbn/core-custom-branding-browser",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",

src/plugins/visualizations/public/visualize_app/app.tsx

@@ -8,7 +8,8 @@
 
 import './app.scss';
 import React, { useEffect, useCallback, useState } from 'react';
-import { Route, Switch, useLocation } from 'react-router-dom';
+import { Switch, useLocation } from 'react-router-dom';
+import { Route } from '@kbn/shared-ux-router';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import type { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';