From 1774abb1f5b88ea63fc929d0675293e261002c2d Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Fri, 26 Jul 2019 14:20:49 -0500
Subject: [PATCH 01/14] Add core-only bundle

---
 .../ui/ui_bundles/ui_bundles_controller.js    |  7 +++++
 src/legacy/ui/ui_render/ui_render_mixin.js    | 30 +++++++++++--------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/legacy/ui/ui_bundles/ui_bundles_controller.js b/src/legacy/ui/ui_bundles/ui_bundles_controller.js
index a4521268ea121c..7041d54d8804c9 100644
--- a/src/legacy/ui/ui_bundles/ui_bundles_controller.js
+++ b/src/legacy/ui/ui_bundles/ui_bundles_controller.js
@@ -81,6 +81,13 @@ export class UiBundlesController {
     this._postLoaders = [];
     this._bundles = [];
 
+    // create a bundle for core-only with no modules
+    this.add({
+      id: 'core',
+      modules: [],
+      template: appEntryTemplate
+    });
+
     // create a bundle for each uiApp
     for (const uiApp of uiApps) {
       this.add({
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index 47d13184bfd0a1..998bcbc8f4f179 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -102,9 +102,7 @@ export function uiRenderMixin(kbnServer, server, config) {
       async handler(request, h) {
         const { id } = request.params;
         const app = server.getUiAppById(id) || server.getHiddenUiAppById(id);
-        if (!app) {
-          throw Boom.notFound(`Unknown app: ${id}`);
-        }
+        const isCore = !app;
 
         const uiSettings = request.getUiSettingsService();
         const darkMode = !authEnabled || request.auth.isAuthenticated
@@ -130,7 +128,9 @@ export function uiRenderMixin(kbnServer, server, config) {
           ),
           `${regularBundlePath}/${darkMode ? 'dark' : 'light'}_theme.style.css`,
           `${regularBundlePath}/commons.style.css`,
-          `${regularBundlePath}/${app.getId()}.style.css`,
+          ...(
+            !isCore ? [`${regularBundlePath}/${app.getId()}.style.css`] : []
+          ),
           ...kbnServer.uiExports.styleSheetPaths
             .filter(path => (
               path.theme === '*' || path.theme === (darkMode ? 'dark' : 'light')
@@ -145,7 +145,7 @@ export function uiRenderMixin(kbnServer, server, config) {
 
         const bootstrap = new AppBootstrap({
           templateData: {
-            appId: app.getId(),
+            appId: isCore ? 'core' : app.getId(),
             regularBundlePath,
             dllBundlePath,
             styleSheetPaths,
@@ -169,7 +169,6 @@ export function uiRenderMixin(kbnServer, server, config) {
     async handler(req, h) {
       const id = req.params.id;
       const app = server.getUiAppById(id);
-      if (!app) throw Boom.notFound('Unknown app ' + id);
 
       try {
         if (kbnServer.status.isGreen()) {
@@ -183,9 +182,15 @@ export function uiRenderMixin(kbnServer, server, config) {
     }
   });
 
-  async function getLegacyKibanaPayload({ app, translations, request, includeUserProvidedConfig }) {
+  async function getUiSettings({ request, includeUserProvidedConfig }) {
     const uiSettings = request.getUiSettingsService();
+    return props({
+      defaults: uiSettings.getDefaults(),
+      user: includeUserProvidedConfig && uiSettings.getUserProvided()
+    });
+  }
 
+  async function getLegacyKibanaPayload({ app, translations, request, includeUserProvidedConfig }) {
     return {
       app,
       translations,
@@ -198,16 +203,15 @@ export function uiRenderMixin(kbnServer, server, config) {
       basePath: request.getBasePath(),
       serverName: config.get('server.name'),
       devMode: config.get('env.dev'),
-      uiSettings: await props({
-        defaults: uiSettings.getDefaults(),
-        user: includeUserProvidedConfig && uiSettings.getUserProvided()
-      })
+      uiSettings: await getUiSettings({ request, includeUserProvidedConfig }),
     };
   }
 
   async function renderApp({ app, h, includeUserProvidedConfig = true, injectedVarsOverrides = {} }) {
     const request = h.request;
     const basePath = request.getBasePath();
+    const uiSettings = await getUiSettings({ request, includeUserProvidedConfig });
+    app = app || { getId: () => 'core' };
 
     const legacyMetadata = await getLegacyKibanaPayload({
       app,
@@ -228,7 +232,7 @@ export function uiRenderMixin(kbnServer, server, config) {
       bootstrapScriptUrl: `${basePath}/bundles/app/${app.getId()}/bootstrap.js`,
       i18n: (id, options) => i18n.translate(id, options),
       locale: i18n.getLocale(),
-      darkMode: get(legacyMetadata.uiSettings.user, ['theme:darkMode', 'userValue'], false),
+      darkMode: get(uiSettings.user, ['theme:darkMode', 'userValue'], false),
 
       injectedMetadata: {
         version: kbnServer.version,
@@ -245,7 +249,7 @@ export function uiRenderMixin(kbnServer, server, config) {
           request,
           mergeVariables(
             injectedVarsOverrides,
-            await server.getInjectedUiAppVars(app.getId()),
+            app ? await server.getInjectedUiAppVars(app.getId()) : {},
             defaultInjectedVars,
           ),
         ),

From 5ec6416ea587baedb355dff34d2b4ed94d26a205 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 29 Jul 2019 13:35:36 -0500
Subject: [PATCH 02/14] Add ApplicationService mounting

---
 .../core/public/kibana-plugin-public.app.md   |  20 ++
 .../public/kibana-plugin-public.app.mount.md  |  13 +
 ...bana-plugin-public.appbase.capabilities.md |  13 +
 ...ibana-plugin-public.appbase.euiicontype.md |  13 +
 .../kibana-plugin-public.appbase.icon.md      |  13 +
 .../public/kibana-plugin-public.appbase.id.md |  11 +
 .../public/kibana-plugin-public.appbase.md    |  25 ++
 .../kibana-plugin-public.appbase.order.md     |  13 +
 .../kibana-plugin-public.appbase.title.md     |  13 +
 .../kibana-plugin-public.appbase.tooltip$.md  |  13 +
 .../kibana-plugin-public.applicationsetup.md  |   3 +-
 ...lugin-public.applicationsetup.register.md} |   6 +-
 ...c.applicationsetup.registermountcontext.md |  25 ++
 ...n-public.applicationstart.availableapps.md |  13 -
 .../kibana-plugin-public.applicationstart.md  |   8 +-
 ...n-public.applicationstart.navigatetoapp.md |  28 ++
 ...c.applicationstart.registermountcontext.md |  25 ++
 ...bana-plugin-public.appmountcontext.core.md |  22 ++
 .../kibana-plugin-public.appmountcontext.md   |  20 ++
 ...n-public.appmountparameters.appbasepath.md |  53 ++++
 ...lugin-public.appmountparameters.element.md |  13 +
 ...kibana-plugin-public.appmountparameters.md |  20 ++
 .../public/kibana-plugin-public.appunmount.md |  13 +
 ...ibana-plugin-public.chromenavlink.order.md |   2 +-
 ...ana-plugin-public.coresetup.application.md |  13 +
 .../public/kibana-plugin-public.coresetup.md  |   1 +
 ...ana-plugin-public.corestart.application.md |   2 +-
 .../public/kibana-plugin-public.corestart.md  |   2 +-
 .../core/public/kibana-plugin-public.md       |   5 +
 package.json                                  |   2 +
 renovate.json5                                |  16 +-
 .../text/0004_application_service_mounting.md |  67 ++--
 .../application_service.test.tsx.snap         |  42 +++
 .../application/application_service.mock.ts   |  41 ++-
 .../application_service.test.mocks.ts         |   8 +
 .../application/application_service.test.tsx  | 212 +++++++++++--
 .../application/application_service.tsx       | 230 +++++++-------
 .../capabilities/capabilities_service.mock.ts |   6 +-
 .../capabilities/capabilities_service.test.ts |  20 +-
 .../capabilities/capabilities_service.tsx     |  27 +-
 src/core/public/application/index.ts          |  14 +-
 src/core/public/application/types.ts          | 293 ++++++++++++++++++
 .../public/application/ui/app_container.tsx   | 115 +++++++
 .../application/ui/app_not_found_screen.tsx   |  51 +++
 src/core/public/application/ui/app_router.tsx |  53 ++++
 src/core/public/application/ui/index.ts       |  20 ++
 .../application/ui/ui_integration.test.tsx    | 131 ++++++++
 src/core/public/chrome/chrome_service.test.ts |   2 +-
 src/core/public/chrome/chrome_service.tsx     |  14 +-
 src/core/public/chrome/nav_links/nav_link.ts  |  10 +-
 .../nav_links/nav_links_service.test.ts       |  31 +-
 .../chrome/nav_links/nav_links_service.ts     |  24 +-
 src/core/public/chrome/ui/header/header.tsx   |  29 +-
 src/core/public/core_system.test.ts           |   4 +-
 src/core/public/core_system.ts                |  35 ++-
 src/core/public/http/http_service.mock.ts     |  19 +-
 src/core/public/index.ts                      |  15 +-
 .../injected_metadata_service.mock.ts         |   2 +
 .../injected_metadata_service.ts              |   7 +
 src/core/public/legacy/legacy_service.test.ts |  19 ++
 src/core/public/legacy/legacy_service.ts      |  40 ++-
 src/core/public/mocks.ts                      |   1 +
 src/core/public/plugins/plugin_context.ts     |   8 +
 .../public/plugins/plugins_service.test.ts    |  11 +-
 src/core/public/public.api.md                 |  75 ++++-
 .../rendering/rendering_service.test.tsx      |  10 +-
 .../public/rendering/rendering_service.tsx    |  26 +-
 src/core/utils/context.mock.ts                |   4 +-
 src/core/utils/pick.ts                        |   5 +-
 .../tests_bundle/tests_entry_template.js      |   1 +
 src/legacy/ui/public/chrome/chrome.js         |   1 -
 .../ui/public/chrome/directives/kbn_chrome.js |  24 +-
 src/legacy/ui/ui_render/ui_render_mixin.js    |   3 +-
 yarn.lock                                     |   4 +-
 74 files changed, 1868 insertions(+), 325 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-public.app.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.app.mount.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.capabilities.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.euiicontype.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.icon.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.id.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.order.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.title.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appbase.tooltip$.md
 rename docs/development/core/public/{kibana-plugin-public.applicationsetup.registerapp.md => kibana-plugin-public.applicationsetup.register.md} (72%)
 create mode 100644 docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
 delete mode 100644 docs/development/core/public/kibana-plugin-public.applicationstart.availableapps.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.applicationstart.navigatetoapp.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appmountcontext.core.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appmountcontext.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appmountparameters.element.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appmountparameters.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.appunmount.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.coresetup.application.md
 create mode 100644 src/core/public/application/__snapshots__/application_service.test.tsx.snap
 create mode 100644 src/core/public/application/types.ts
 create mode 100644 src/core/public/application/ui/app_container.tsx
 create mode 100644 src/core/public/application/ui/app_not_found_screen.tsx
 create mode 100644 src/core/public/application/ui/app_router.tsx
 create mode 100644 src/core/public/application/ui/index.ts
 create mode 100644 src/core/public/application/ui/ui_integration.test.tsx

diff --git a/docs/development/core/public/kibana-plugin-public.app.md b/docs/development/core/public/kibana-plugin-public.app.md
new file mode 100644
index 00000000000000..317d70e8045290
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.app.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [App](./kibana-plugin-public.app.md)
+
+## App interface
+
+Extension of [common app properties](./kibana-plugin-public.appbase.md) with the mount function.
+
+<b>Signature:</b>
+
+```typescript
+export interface App extends AppBase 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [mount](./kibana-plugin-public.app.mount.md) | <code>(context: AppMountContext, params: AppMountParameters) =&gt; AppUnmount &#124; Promise&lt;AppUnmount&gt;</code> | A mount function called when the user navigates to this app's <code>rootRoute</code>. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.app.mount.md b/docs/development/core/public/kibana-plugin-public.app.mount.md
new file mode 100644
index 00000000000000..fc2debd50fff87
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.app.mount.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [App](./kibana-plugin-public.app.md) &gt; [mount](./kibana-plugin-public.app.mount.md)
+
+## App.mount property
+
+A mount function called when the user navigates to this app's `rootRoute`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+mount: (context: AppMountContext, params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.capabilities.md b/docs/development/core/public/kibana-plugin-public.appbase.capabilities.md
new file mode 100644
index 00000000000000..450972e41bb299
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.capabilities.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [capabilities](./kibana-plugin-public.appbase.capabilities.md)
+
+## AppBase.capabilities property
+
+Custom capabilities defined by the app.
+
+<b>Signature:</b>
+
+```typescript
+capabilities?: Partial<Capabilities>;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.euiicontype.md b/docs/development/core/public/kibana-plugin-public.appbase.euiicontype.md
new file mode 100644
index 00000000000000..99c7e852ff9052
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.euiicontype.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [euiIconType](./kibana-plugin-public.appbase.euiicontype.md)
+
+## AppBase.euiIconType property
+
+A EUI iconType that will be used for the app's icon. This icon takes precendence over the `icon` property.
+
+<b>Signature:</b>
+
+```typescript
+euiIconType?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.icon.md b/docs/development/core/public/kibana-plugin-public.appbase.icon.md
new file mode 100644
index 00000000000000..d94d0897bc5b75
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.icon.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [icon](./kibana-plugin-public.appbase.icon.md)
+
+## AppBase.icon property
+
+A URL to an image file used as an icon. Used as a fallback if `euiIconType` is not provided.
+
+<b>Signature:</b>
+
+```typescript
+icon?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.id.md b/docs/development/core/public/kibana-plugin-public.appbase.id.md
new file mode 100644
index 00000000000000..57daa0c94bdf6b
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.id.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [id](./kibana-plugin-public.appbase.id.md)
+
+## AppBase.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.md b/docs/development/core/public/kibana-plugin-public.appbase.md
new file mode 100644
index 00000000000000..338d30e780aaf0
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md)
+
+## AppBase interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface AppBase 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [capabilities](./kibana-plugin-public.appbase.capabilities.md) | <code>Partial&lt;Capabilities&gt;</code> | Custom capabilities defined by the app. |
+|  [euiIconType](./kibana-plugin-public.appbase.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
+|  [icon](./kibana-plugin-public.appbase.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
+|  [id](./kibana-plugin-public.appbase.id.md) | <code>string</code> |  |
+|  [order](./kibana-plugin-public.appbase.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
+|  [title](./kibana-plugin-public.appbase.title.md) | <code>string</code> | The title of the application. |
+|  [tooltip$](./kibana-plugin-public.appbase.tooltip$.md) | <code>Observable&lt;string&gt;</code> | An observable for a tooltip shown when hovering over app link. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.order.md b/docs/development/core/public/kibana-plugin-public.appbase.order.md
new file mode 100644
index 00000000000000..dc0ea14a7b860b
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.order.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [order](./kibana-plugin-public.appbase.order.md)
+
+## AppBase.order property
+
+An ordinal used to sort nav links relative to one another for display.
+
+<b>Signature:</b>
+
+```typescript
+order?: number;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.title.md b/docs/development/core/public/kibana-plugin-public.appbase.title.md
new file mode 100644
index 00000000000000..4d0fb0c18e8143
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.title.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [title](./kibana-plugin-public.appbase.title.md)
+
+## AppBase.title property
+
+The title of the application.
+
+<b>Signature:</b>
+
+```typescript
+title: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appbase.tooltip$.md b/docs/development/core/public/kibana-plugin-public.appbase.tooltip$.md
new file mode 100644
index 00000000000000..1b8ca490825f92
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appbase.tooltip$.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppBase](./kibana-plugin-public.appbase.md) &gt; [tooltip$](./kibana-plugin-public.appbase.tooltip$.md)
+
+## AppBase.tooltip$ property
+
+An observable for a tooltip shown when hovering over app link.
+
+<b>Signature:</b>
+
+```typescript
+tooltip$?: Observable<string>;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.md
index a3ab77e43446c9..d7ed7bad20ceaa 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.md
@@ -15,5 +15,6 @@ export interface ApplicationSetup
 
 |  Method | Description |
 |  --- | --- |
-|  [registerApp(app)](./kibana-plugin-public.applicationsetup.registerapp.md) | Register an mountable application to the system. Apps will be mounted based on their <code>rootRoute</code>. |
+|  [register(app)](./kibana-plugin-public.applicationsetup.register.md) | Register an mountable application to the system. Apps will be mounted based on their <code>rootRoute</code>. |
+|  [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationsetup.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. |
 
diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.registerapp.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
similarity index 72%
rename from docs/development/core/public/kibana-plugin-public.applicationsetup.registerapp.md
rename to docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
index f2532ae71ca2f6..a24eb19c2ea6bb 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.registerapp.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
@@ -1,15 +1,15 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationSetup](./kibana-plugin-public.applicationsetup.md) &gt; [registerApp](./kibana-plugin-public.applicationsetup.registerapp.md)
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationSetup](./kibana-plugin-public.applicationsetup.md) &gt; [register](./kibana-plugin-public.applicationsetup.register.md)
 
-## ApplicationSetup.registerApp() method
+## ApplicationSetup.register() method
 
 Register an mountable application to the system. Apps will be mounted based on their `rootRoute`<!-- -->.
 
 <b>Signature:</b>
 
 ```typescript
-registerApp(app: App): void;
+register(app: App): void;
 ```
 
 ## Parameters
diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
new file mode 100644
index 00000000000000..cda400df6d0294
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationSetup](./kibana-plugin-public.applicationsetup.md) &gt; [registerMountContext](./kibana-plugin-public.applicationsetup.registermountcontext.md)
+
+## ApplicationSetup.registerMountContext() method
+
+Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context.
+
+<b>Signature:</b>
+
+```typescript
+registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, keyof AppMountContext>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  contextName | <code>T</code> | The key of [AppMountContext](./kibana-plugin-public.appmountcontext.md) this provider's return value should be attached to. |
+|  provider | <code>IContextProvider&lt;AppMountContext, keyof AppMountContext&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.availableapps.md b/docs/development/core/public/kibana-plugin-public.applicationstart.availableapps.md
deleted file mode 100644
index 8bbd1dfcd31fad..00000000000000
--- a/docs/development/core/public/kibana-plugin-public.applicationstart.availableapps.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationStart](./kibana-plugin-public.applicationstart.md) &gt; [availableApps](./kibana-plugin-public.applicationstart.availableapps.md)
-
-## ApplicationStart.availableApps property
-
-Apps available based on the current capabilities. Should be used to show navigation links and make routing decisions.
-
-<b>Signature:</b>
-
-```typescript
-availableApps: readonly App[];
-```
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.md b/docs/development/core/public/kibana-plugin-public.applicationstart.md
index 5854a7c65714eb..2d1450dce940e7 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationstart.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.md
@@ -15,6 +15,12 @@ export interface ApplicationStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [availableApps](./kibana-plugin-public.applicationstart.availableapps.md) | <code>readonly App[]</code> | Apps available based on the current capabilities. Should be used to show navigation links and make routing decisions. |
 |  [capabilities](./kibana-plugin-public.applicationstart.capabilities.md) | <code>RecursiveReadonly&lt;Capabilities&gt;</code> | Gets the read-only capabilities. |
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [navigateToApp(appId, options)](./kibana-plugin-public.applicationstart.navigatetoapp.md) | Navigiate to a given app |
+|  [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.navigatetoapp.md b/docs/development/core/public/kibana-plugin-public.applicationstart.navigatetoapp.md
new file mode 100644
index 00000000000000..eef31fe661f54f
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.navigatetoapp.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationStart](./kibana-plugin-public.applicationstart.md) &gt; [navigateToApp](./kibana-plugin-public.applicationstart.navigatetoapp.md)
+
+## ApplicationStart.navigateToApp() method
+
+Navigiate to a given app
+
+<b>Signature:</b>
+
+```typescript
+navigateToApp(appId: string, options?: {
+        path?: string;
+        state?: any;
+    }): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  appId | <code>string</code> |  |
+|  options | <code>{</code><br/><code>        path?: string;</code><br/><code>        state?: any;</code><br/><code>    }</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md b/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
new file mode 100644
index 00000000000000..fc86aaf658b681
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
@@ -0,0 +1,25 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationStart](./kibana-plugin-public.applicationstart.md) &gt; [registerMountContext](./kibana-plugin-public.applicationstart.registermountcontext.md)
+
+## ApplicationStart.registerMountContext() method
+
+Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context.
+
+<b>Signature:</b>
+
+```typescript
+registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  contextName | <code>T</code> | The key of [AppMountContext](./kibana-plugin-public.appmountcontext.md) this provider's return value should be attached to. |
+|  provider | <code>IContextProvider&lt;AppMountContext, T&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/core/public/kibana-plugin-public.appmountcontext.core.md b/docs/development/core/public/kibana-plugin-public.appmountcontext.core.md
new file mode 100644
index 00000000000000..63b3ead814f003
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appmountcontext.core.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountContext](./kibana-plugin-public.appmountcontext.md) &gt; [core](./kibana-plugin-public.appmountcontext.core.md)
+
+## AppMountContext.core property
+
+Core service APIs available to mounted applications.
+
+<b>Signature:</b>
+
+```typescript
+core: {
+        application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp'>;
+        chrome: ChromeStart;
+        docLinks: DocLinksStart;
+        http: HttpStart;
+        i18n: I18nStart;
+        notifications: NotificationsStart;
+        overlays: OverlayStart;
+        uiSettings: UiSettingsClientContract;
+    };
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appmountcontext.md b/docs/development/core/public/kibana-plugin-public.appmountcontext.md
new file mode 100644
index 00000000000000..c6541e3eca392f
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appmountcontext.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountContext](./kibana-plugin-public.appmountcontext.md)
+
+## AppMountContext interface
+
+The context object received when applications are mounted to the DOM.
+
+<b>Signature:</b>
+
+```typescript
+export interface AppMountContext 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [core](./kibana-plugin-public.appmountcontext.core.md) | <code>{</code><br/><code>        application: Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp'&gt;;</code><br/><code>        chrome: ChromeStart;</code><br/><code>        docLinks: DocLinksStart;</code><br/><code>        http: HttpStart;</code><br/><code>        i18n: I18nStart;</code><br/><code>        notifications: NotificationsStart;</code><br/><code>        overlays: OverlayStart;</code><br/><code>        uiSettings: UiSettingsClientContract;</code><br/><code>    }</code> | Core service APIs available to mounted applications. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md b/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
new file mode 100644
index 00000000000000..c8ddf12e7c318d
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
@@ -0,0 +1,53 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountParameters](./kibana-plugin-public.appmountparameters.md) &gt; [appBasePath](./kibana-plugin-public.appmountparameters.appbasepath.md)
+
+## AppMountParameters.appBasePath property
+
+The base path for configuring the application's router.
+
+<b>Signature:</b>
+
+```typescript
+appBasePath: string;
+```
+
+## Example
+
+How to configure react-router with a base path:
+
+```ts
+// inside your plugin's setup function
+export class MyPlugin implements Plugin {
+  setup({ application }) {
+    application.register({
+    id: 'my-app',
+    async mount(context, params) {
+      const { renderApp } = await import('./applcation');
+      return renderApp(context, params);
+    },
+  });
+}
+
+```
+
+```ts
+// application.tsx
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { BrowserRouter, Route } from 'react-router-dom';
+
+export renderApp = (context, { appBasePath, element }) => {
+  ReactDOM.render(
+    // pass `appBasePath` to `basename`
+    <BrowserRouter basename={appBasePath}>
+      <Route path="/" exact component={HomePage} />
+    </BrowserRouter>,
+    element
+  );
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+}
+
+```
+
diff --git a/docs/development/core/public/kibana-plugin-public.appmountparameters.element.md b/docs/development/core/public/kibana-plugin-public.appmountparameters.element.md
new file mode 100644
index 00000000000000..dbe496c01c2150
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appmountparameters.element.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountParameters](./kibana-plugin-public.appmountparameters.md) &gt; [element](./kibana-plugin-public.appmountparameters.element.md)
+
+## AppMountParameters.element property
+
+The container element to render the application into.
+
+<b>Signature:</b>
+
+```typescript
+element: HTMLElement;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.appmountparameters.md b/docs/development/core/public/kibana-plugin-public.appmountparameters.md
new file mode 100644
index 00000000000000..8733f9cd4915d3
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appmountparameters.md
@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountParameters](./kibana-plugin-public.appmountparameters.md)
+
+## AppMountParameters interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface AppMountParameters 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [appBasePath](./kibana-plugin-public.appmountparameters.appbasepath.md) | <code>string</code> | The base path for configuring the application's router. |
+|  [element](./kibana-plugin-public.appmountparameters.element.md) | <code>HTMLElement</code> | The container element to render the application into. |
+
diff --git a/docs/development/core/public/kibana-plugin-public.appunmount.md b/docs/development/core/public/kibana-plugin-public.appunmount.md
new file mode 100644
index 00000000000000..61782d19ca8c58
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appunmount.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppUnmount](./kibana-plugin-public.appunmount.md)
+
+## AppUnmount type
+
+A function called when an application should be unmounted from the page. This function should be synchronous.
+
+<b>Signature:</b>
+
+```typescript
+export declare type AppUnmount = () => void;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.chromenavlink.order.md b/docs/development/core/public/kibana-plugin-public.chromenavlink.order.md
index e4e2ad2c7a3a7b..1fef9fc1dc359d 100644
--- a/docs/development/core/public/kibana-plugin-public.chromenavlink.order.md
+++ b/docs/development/core/public/kibana-plugin-public.chromenavlink.order.md
@@ -9,5 +9,5 @@ An ordinal used to sort nav links relative to one another for display.
 <b>Signature:</b>
 
 ```typescript
-readonly order: number;
+readonly order?: number;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.coresetup.application.md b/docs/development/core/public/kibana-plugin-public.coresetup.application.md
new file mode 100644
index 00000000000000..4b39b2c76802b1
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.coresetup.application.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [CoreSetup](./kibana-plugin-public.coresetup.md) &gt; [application](./kibana-plugin-public.coresetup.application.md)
+
+## CoreSetup.application property
+
+[ApplicationSetup](./kibana-plugin-public.applicationsetup.md)
+
+<b>Signature:</b>
+
+```typescript
+application: ApplicationSetup;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.coresetup.md b/docs/development/core/public/kibana-plugin-public.coresetup.md
index a4b5b88df36dc4..9b94e2db528319 100644
--- a/docs/development/core/public/kibana-plugin-public.coresetup.md
+++ b/docs/development/core/public/kibana-plugin-public.coresetup.md
@@ -16,6 +16,7 @@ export interface CoreSetup
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [application](./kibana-plugin-public.coresetup.application.md) | <code>ApplicationSetup</code> | [ApplicationSetup](./kibana-plugin-public.applicationsetup.md) |
 |  [context](./kibana-plugin-public.coresetup.context.md) | <code>ContextSetup</code> | [ContextSetup](./kibana-plugin-public.contextsetup.md) |
 |  [fatalErrors](./kibana-plugin-public.coresetup.fatalerrors.md) | <code>FatalErrorsSetup</code> | [FatalErrorsSetup](./kibana-plugin-public.fatalerrorssetup.md) |
 |  [http](./kibana-plugin-public.coresetup.http.md) | <code>HttpSetup</code> | [HttpSetup](./kibana-plugin-public.httpsetup.md) |
diff --git a/docs/development/core/public/kibana-plugin-public.corestart.application.md b/docs/development/core/public/kibana-plugin-public.corestart.application.md
index 1dd05ff947aeba..c3bf2953b5175d 100644
--- a/docs/development/core/public/kibana-plugin-public.corestart.application.md
+++ b/docs/development/core/public/kibana-plugin-public.corestart.application.md
@@ -9,5 +9,5 @@
 <b>Signature:</b>
 
 ```typescript
-application: Pick<ApplicationStart, 'capabilities'>;
+application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'registerMountContext'>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.corestart.md b/docs/development/core/public/kibana-plugin-public.corestart.md
index 446e4587352142..74b578f4511584 100644
--- a/docs/development/core/public/kibana-plugin-public.corestart.md
+++ b/docs/development/core/public/kibana-plugin-public.corestart.md
@@ -16,7 +16,7 @@ export interface CoreStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [application](./kibana-plugin-public.corestart.application.md) | <code>Pick&lt;ApplicationStart, 'capabilities'&gt;</code> | [ApplicationStart](./kibana-plugin-public.applicationstart.md) |
+|  [application](./kibana-plugin-public.corestart.application.md) | <code>Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp' &#124; 'registerMountContext'&gt;</code> | [ApplicationStart](./kibana-plugin-public.applicationstart.md) |
 |  [chrome](./kibana-plugin-public.corestart.chrome.md) | <code>ChromeStart</code> | [ChromeStart](./kibana-plugin-public.chromestart.md) |
 |  [docLinks](./kibana-plugin-public.corestart.doclinks.md) | <code>DocLinksStart</code> | [DocLinksStart](./kibana-plugin-public.doclinksstart.md) |
 |  [http](./kibana-plugin-public.corestart.http.md) | <code>HttpStart</code> | [HttpStart](./kibana-plugin-public.httpstart.md) |
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index 5fda9f91593061..69c9aebbc8c825 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -23,8 +23,12 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Interface | Description |
 |  --- | --- |
+|  [App](./kibana-plugin-public.app.md) | Extension of [common app properties](./kibana-plugin-public.appbase.md) with the mount function. |
+|  [AppBase](./kibana-plugin-public.appbase.md) |  |
 |  [ApplicationSetup](./kibana-plugin-public.applicationsetup.md) |  |
 |  [ApplicationStart](./kibana-plugin-public.applicationstart.md) |  |
+|  [AppMountContext](./kibana-plugin-public.appmountcontext.md) | The context object received when applications are mounted to the DOM. |
+|  [AppMountParameters](./kibana-plugin-public.appmountparameters.md) |  |
 |  [Capabilities](./kibana-plugin-public.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
 |  [ChromeBadge](./kibana-plugin-public.chromebadge.md) |  |
 |  [ChromeBrand](./kibana-plugin-public.chromebrand.md) |  |
@@ -80,6 +84,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Type Alias | Description |
 |  --- | --- |
+|  [AppUnmount](./kibana-plugin-public.appunmount.md) | A function called when an application should be unmounted from the page. This function should be synchronous. |
 |  [ChromeHelpExtension](./kibana-plugin-public.chromehelpextension.md) |  |
 |  [ChromeNavLinkUpdateableFields](./kibana-plugin-public.chromenavlinkupdateablefields.md) |  |
 |  [HttpBody](./kibana-plugin-public.httpbody.md) |  |
diff --git a/package.json b/package.json
index b3ca135eea9c3b..3b1718c9e9459f 100644
--- a/package.json
+++ b/package.json
@@ -118,6 +118,7 @@
     "@kbn/pm": "1.0.0",
     "@kbn/test-subj-selector": "0.2.1",
     "@kbn/ui-framework": "1.0.0",
+    "@types/history": "^4.7.2",
     "@types/json-stable-stringify": "^1.0.32",
     "@types/lodash.clonedeep": "^4.5.4",
     "@types/react-grid-layout": "^0.16.7",
@@ -164,6 +165,7 @@
     "handlebars": "4.1.2",
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
+    "history": "^4.9.0",
     "hjson": "3.1.2",
     "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
diff --git a/renovate.json5 b/renovate.json5
index 71d0a1ef9fee55..ee9a230539e050 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -240,6 +240,14 @@
           '(\\b|_)storybook(\\b|_)',
         ],
       },
+      {
+        groupSlug: 'history',
+        groupName: 'history related packages',
+        packageNames: [
+          'history',
+          '@types/history',
+        ],
+      },
       {
         groupSlug: 'json-stable-stringify',
         groupName: 'json-stable-stringify related packages',
@@ -616,14 +624,6 @@
           '@types/git-url-parse',
         ],
       },
-      {
-        groupSlug: 'history',
-        groupName: 'history related packages',
-        packageNames: [
-          'history',
-          '@types/history',
-        ],
-      },
       {
         groupSlug: 'jsdom',
         groupName: 'jsdom related packages',
diff --git a/rfcs/text/0004_application_service_mounting.md b/rfcs/text/0004_application_service_mounting.md
index 30e8d9a05b8b4e..7dc577abc48e3d 100644
--- a/rfcs/text/0004_application_service_mounting.md
+++ b/rfcs/text/0004_application_service_mounting.md
@@ -18,14 +18,14 @@ import ReactDOM from 'react-dom';
 
 import { MyApp } from './componnets';
 
-export function renderApp(context, targetDomElement) {
+export function renderApp(context, { element }) {
   ReactDOM.render(
     <MyApp mountContext={context} deps={pluginStart} />,
-    targetDomElement
+    element
   );
 
   return () => {
-    ReactDOM.unmountComponentAtNode(targetDomElement);
+    ReactDOM.unmountComponentAtNode(element);
   };
 }
 ```
@@ -38,9 +38,9 @@ class MyPlugin {
     application.register({
       id: 'my-app',
       title: 'My Application',
-      async mount(context, targetDomElement) {
+      async mount(context, params) {
         const { renderApp } = await import('./applcation');
-        return renderApp(context, targetDomElement);
+        return renderApp(context, params);
       }
     });
   }
@@ -63,9 +63,7 @@ lock-in.
 
 ```ts
 /** A context type that implements the Handler Context pattern from RFC-0003 */
-export interface MountContext {
-  /** This is the base path for setting up your router. */
-  basename: string;
+export interface AppMountContext {
   /** These services serve as an example, but are subject to change. */
   core: {
     http: {
@@ -93,6 +91,13 @@ export interface MountContext {
   [contextName: string]: unknown;
 }
 
+export interface AppMountParams {
+  /** The base path the application is mounted on. Used to configure routers. */
+  appBasePath: string;
+  /** The element the application should render into */
+  element: HTMLElement;
+}
+
 export type Unmount = () => Promise<void> | void;
 
 export interface AppSpec {
@@ -109,11 +114,11 @@ export interface AppSpec {
 
   /**
    * A mount function called when the user navigates to this app's route.
-   * @param context the `MountContext generated for this app
-   * @param targetDomElement An HTMLElement to mount the application onto.
+   * @param context the `AppMountContext` generated for this app
+   * @param params the `AppMountParams`
    * @returns An unmounting function that will be called to unmount the application.
    */
-  mount(context: MountContext, targetDomElement: HTMLElement): Unmount | Promise<Unmount>;
+  mount(context: MountContext, params: AppMountParams): Unmount | Promise<Unmount>;
 
   /**
    * A EUI iconType that will be used for the app's icon. This icon
@@ -158,19 +163,21 @@ When an app is registered via `register`, it must provide a `mount` function
 that will be invoked whenever the window's location has changed from another app
 to this app.
 
-This function is called with a `MountContext` and an `HTMLElement` for the
-application to render itself to. The mount function must also return a function
-that can be called by the ApplicationService to unmount the application at the
-given DOM node. The mount function may return a Promise of an unmount function
-in order to import UI code dynamically.
+This function is called with a `AppMountContext` and an
+`AppMountParams` which contains a `HTMLElement` for the application to
+render itself to. The mount function must also return a function that can be
+called by the ApplicationService to unmount the application at the given DOM
+Element. The mount function may return a Promise of an unmount function in order
+to import UI code dynamically.
 
 The ApplicationService's `register` method will only be available during the
 *setup* lifecycle event. This allows the system to know when all applications
 have been registered.
 
-The `mount` function will also get access to the `MountContext` that has many of
-the same core services available during the `start` lifecycle. Plugins can also
-register additional context attributes via the `registerMountContext` function.
+The `mount` function will also get access to the `AppMountContext` that
+has many of the same core services available during the `start` lifecycle.
+Plugins can also register additional context attributes via the
+`registerMountContext` function.
 
 ## Routing
 
@@ -190,7 +197,7 @@ An example:
   "overview" page: mykibana.com/app/my-app/overview
 
 When setting up a router, your application should only handle the part of the
-URL following the `context.basename` provided when you application is mounted.
+URL following the `params.appBasePath` provided when you application is mounted.
 
 ### Legacy Applications
 
@@ -211,7 +218,7 @@ a full-featured router and code-splitting. Note that using React or any other
 3rd party tools featured here is not required to build a Kibana Application.
 
 ```tsx
-// my_plugin/public/application.ts
+// my_plugin/public/application.tsx
 
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -239,16 +246,16 @@ const MyApp = ({ basename }) => (
   </BrowserRouter>,
 );
 
-export function renderApp(context, targetDomElement) {
+export function renderApp(context, params) {
   ReactDOM.render(
-    // `context.basename` would be `/app/my-app` in this example.
-    // This exact string is not guaranteed to be stable, always reference
-    // `context.basename`.
-    <MyApp basename={context.basename} />,
-    targetDomElem
+    // `params.appBasePath` would be `/app/my-app` in this example.
+    // This exact string is not guaranteed to be stable, always reference the
+    // provided value at `params.appBasePath`.
+    <MyApp basename={params.appBasePath} />,
+    params.element
   );
 
-  return () => ReactDOM.unmountComponentAtNode(targetDomElem);
+  return () => ReactDOM.unmountComponentAtNode(params.element);
 }
 ```
 
@@ -259,9 +266,9 @@ export class MyPlugin {
   setup({ application }) {
     application.register({
       id: 'my-app',
-      async mount(context, targetDomElem) {
+      async mount(context, params) {
         const { renderApp } = await import('./applcation');
-        return renderApp(context, targetDomElement);
+        return renderApp(context, params);
       }
     });
   }
diff --git a/src/core/public/application/__snapshots__/application_service.test.tsx.snap b/src/core/public/application/__snapshots__/application_service.test.tsx.snap
new file mode 100644
index 00000000000000..f2756df74cda51
--- /dev/null
+++ b/src/core/public/application/__snapshots__/application_service.test.tsx.snap
@@ -0,0 +1,42 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`#start() returns renderable JSX tree 1`] = `
+<AppRouter
+  apps={Map {}}
+  basePath={
+    Object {
+      "get": [MockFunction] {
+        "calls": Array [
+          Array [],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": "",
+          },
+        ],
+      },
+      "prepend": [MockFunction],
+      "remove": [MockFunction],
+    }
+  }
+  currentAppId$={
+    BehaviorSubject {
+      "_isScalar": false,
+      "_value": undefined,
+      "closed": false,
+      "hasError": false,
+      "isStopped": false,
+      "observers": Array [],
+      "thrownError": null,
+    }
+  }
+  history={
+    Object {
+      "push": [MockFunction],
+    }
+  }
+  legacyApps={Map {}}
+  redirectTo={[Function]}
+/>
+`;
diff --git a/src/core/public/application/application_service.mock.ts b/src/core/public/application/application_service.mock.ts
index 85d997f3dc9aad..a0a8b5514882b5 100644
--- a/src/core/public/application/application_service.mock.ts
+++ b/src/core/public/application/application_service.mock.ts
@@ -17,23 +17,49 @@
  * under the License.
  */
 
+import { Subject } from 'rxjs';
+
 import { capabilitiesServiceMock } from './capabilities/capabilities_service.mock';
-import { ApplicationService, ApplicationSetup, ApplicationStart } from './application_service';
+import { ApplicationService } from './application_service';
+import {
+  ApplicationSetup,
+  InternalApplicationStart,
+  ApplicationStart,
+  InternalApplicationSetup,
+} from './types';
 
 type ApplicationServiceContract = PublicMethodsOf<ApplicationService>;
 
 const createSetupContractMock = (): jest.Mocked<ApplicationSetup> => ({
-  registerApp: jest.fn(),
+  register: jest.fn(),
+  registerMountContext: jest.fn(),
+});
+
+const createInternalSetupContractMock = (): jest.Mocked<InternalApplicationSetup> => ({
+  register: jest.fn(),
   registerLegacyApp: jest.fn(),
+  registerMountContext: jest.fn(),
 });
 
-const createStartContractMock = (): jest.Mocked<ApplicationStart> => ({
-  ...capabilitiesServiceMock.createStartContract(),
+const createStartContractMock = (legacyMode = false): jest.Mocked<ApplicationStart> => ({
+  capabilities: capabilitiesServiceMock.createStartContract().capabilities,
+  navigateToApp: jest.fn(),
+  registerMountContext: jest.fn(),
+});
+
+const createInternalStartContractMock = (): jest.Mocked<InternalApplicationStart> => ({
+  availableApps: new Map(),
+  availableLegacyApps: new Map(),
+  capabilities: capabilitiesServiceMock.createStartContract().capabilities,
+  navigateToApp: jest.fn(),
+  registerMountContext: jest.fn(),
+  currentAppId$: new Subject<string | undefined>(),
+  getComponent: jest.fn(),
 });
 
 const createMock = (): jest.Mocked<ApplicationServiceContract> => ({
-  setup: jest.fn().mockReturnValue(createSetupContractMock()),
-  start: jest.fn().mockReturnValue(createStartContractMock()),
+  setup: jest.fn().mockReturnValue(createInternalSetupContractMock()),
+  start: jest.fn().mockReturnValue(createInternalStartContractMock()),
   stop: jest.fn(),
 });
 
@@ -41,4 +67,7 @@ export const applicationServiceMock = {
   create: createMock,
   createSetupContract: createSetupContractMock,
   createStartContract: createStartContractMock,
+
+  createInternalSetupContract: createInternalSetupContractMock,
+  createInternalStartContract: createInternalStartContractMock,
 };
diff --git a/src/core/public/application/application_service.test.mocks.ts b/src/core/public/application/application_service.test.mocks.ts
index c28d0a203068a8..d829cf18e56be2 100644
--- a/src/core/public/application/application_service.test.mocks.ts
+++ b/src/core/public/application/application_service.test.mocks.ts
@@ -26,3 +26,11 @@ export const CapabilitiesServiceConstructor = jest
 jest.doMock('./capabilities', () => ({
   CapabilitiesService: CapabilitiesServiceConstructor,
 }));
+
+export const MockHistory = {
+  push: jest.fn(),
+};
+export const createBrowserHistoryMock = jest.fn().mockReturnValue(MockHistory);
+jest.doMock('history', () => ({
+  createBrowserHistory: createBrowserHistoryMock,
+}));
diff --git a/src/core/public/application/application_service.test.tsx b/src/core/public/application/application_service.test.tsx
index d2266671367a28..cffac8cb27df22 100644
--- a/src/core/public/application/application_service.test.tsx
+++ b/src/core/public/application/application_service.test.tsx
@@ -17,57 +17,219 @@
  * under the License.
  */
 
+import { shallow } from 'enzyme';
+import React from 'react';
+
 import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
-import { MockCapabilitiesService } from './application_service.test.mocks';
+import { MockCapabilitiesService, MockHistory } from './application_service.test.mocks';
 import { ApplicationService } from './application_service';
+import { contextServiceMock } from '../context/context_service.mock';
+import { httpServiceMock } from '../http/http_service.mock';
+
+describe('#setup()', () => {
+  describe('register', () => {
+    it('throws an error if two apps with the same id are registered', () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      const setup = service.setup({ context });
+      setup.register(Symbol(), { id: 'app1' } as any);
+      expect(() =>
+        setup.register(Symbol(), { id: 'app1' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"An application is already registered with the id \\"app1\\""`
+      );
+    });
+
+    it('throws error if additional apps are registered after setup', async () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      const setup = service.setup({ context });
+      const http = httpServiceMock.createStartContract();
+      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+      await service.start({ http, injectedMetadata });
+      expect(() =>
+        setup.register(Symbol(), { id: 'app1' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(`"Applications cannot be registered after \\"setup\\""`);
+    });
+  });
+
+  describe('registerLegacyApp', () => {
+    it('throws an error if two apps with the same id are registered', () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      const setup = service.setup({ context });
+      setup.registerLegacyApp({ id: 'app2' } as any);
+      expect(() =>
+        setup.registerLegacyApp({ id: 'app2' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"A legacy application is already registered with the id \\"app2\\""`
+      );
+    });
+
+    it('throws error if additional apps are registered after setup', async () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      const setup = service.setup({ context });
+      const http = httpServiceMock.createStartContract();
+      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+      await service.start({ http, injectedMetadata });
+      expect(() =>
+        setup.registerLegacyApp({ id: 'app2' } as any)
+      ).toThrowErrorMatchingInlineSnapshot(`"Applications cannot be registered after \\"setup\\""`);
+    });
+  });
+
+  it("`registerMountContext` calls context container's registerContext", () => {
+    const service = new ApplicationService();
+    const context = contextServiceMock.createSetupContract();
+    const setup = service.setup({ context });
+    const container = context.createContextContainer.mock.results[0].value;
+    const pluginId = Symbol();
+    const noop = () => {};
+    setup.registerMountContext(pluginId, 'test' as any, noop as any);
+    expect(container.registerContext).toHaveBeenCalledWith(pluginId, 'test', noop);
+  });
+});
 
 describe('#start()', () => {
+  beforeEach(() => {
+    MockHistory.push.mockReset();
+  });
+
   it('exposes available apps from capabilities', async () => {
     const service = new ApplicationService();
-    const setup = service.setup();
-    setup.registerApp({ id: 'app1' } as any);
+    const context = contextServiceMock.createSetupContract();
+    const setup = service.setup({ context });
+    setup.register(Symbol(), { id: 'app1' } as any);
     setup.registerLegacyApp({ id: 'app2' } as any);
+
+    const http = httpServiceMock.createStartContract();
     const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    const startContract = await service.start({ injectedMetadata });
+    const startContract = await service.start({ http, injectedMetadata });
+
     expect(startContract.availableApps).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "id": "app1",
-  },
-]
-`);
+                        Map {
+                          "app1" => Object {
+                            "id": "app1",
+                          },
+                        }
+                `);
     expect(startContract.availableLegacyApps).toMatchInlineSnapshot(`
-Array [
-  Object {
-    "id": "app2",
-  },
-]
-`);
+                        Map {
+                          "app2" => Object {
+                            "id": "app2",
+                          },
+                        }
+                `);
   });
 
   it('passes registered applications to capabilities', async () => {
     const service = new ApplicationService();
-    const setup = service.setup();
-    setup.registerApp({ id: 'app1' } as any);
+    const context = contextServiceMock.createSetupContract();
+    const setup = service.setup({ context });
+    setup.register(Symbol(), { id: 'app1' } as any);
+
+    const http = httpServiceMock.createStartContract();
     const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    await service.start({ injectedMetadata });
+    await service.start({ http, injectedMetadata });
+
     expect(MockCapabilitiesService.start).toHaveBeenCalledWith({
-      apps: [{ id: 'app1' }],
-      legacyApps: [],
+      apps: new Map([['app1', { id: 'app1' }]]),
+      legacyApps: new Map(),
       injectedMetadata,
     });
   });
 
   it('passes registered legacy applications to capabilities', async () => {
     const service = new ApplicationService();
-    const setup = service.setup();
+    const context = contextServiceMock.createSetupContract();
+    const setup = service.setup({ context });
     setup.registerLegacyApp({ id: 'legacyApp1' } as any);
+
+    const http = httpServiceMock.createStartContract();
     const injectedMetadata = injectedMetadataServiceMock.createStartContract();
-    await service.start({ injectedMetadata });
+    await service.start({ http, injectedMetadata });
+
     expect(MockCapabilitiesService.start).toHaveBeenCalledWith({
-      apps: [],
-      legacyApps: [{ id: 'legacyApp1' }],
+      apps: new Map(),
+      legacyApps: new Map([['legacyApp1', { id: 'legacyApp1' }]]),
       injectedMetadata,
     });
   });
+
+  it('returns renderable JSX tree', async () => {
+    const service = new ApplicationService();
+    const context = contextServiceMock.createSetupContract();
+    service.setup({ context });
+
+    const http = httpServiceMock.createStartContract();
+    const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+    injectedMetadata.getLegacyMode.mockReturnValue(false);
+    const start = await service.start({ http, injectedMetadata });
+
+    expect(shallow(React.createElement(() => start.getComponent()))).toMatchSnapshot();
+  });
+
+  describe('navigateToApp', () => {
+    it('changes the browser history to /app/:appId', async () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      service.setup({ context });
+
+      const http = httpServiceMock.createStartContract();
+      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+      injectedMetadata.getLegacyMode.mockReturnValue(false);
+      const start = await service.start({ http, injectedMetadata });
+
+      start.navigateToApp('myTestApp');
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', undefined);
+      start.navigateToApp('myOtherApp');
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myOtherApp', undefined);
+    });
+
+    it('appends a path if specified', async () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      service.setup({ context });
+
+      const http = httpServiceMock.createStartContract();
+      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+      injectedMetadata.getLegacyMode.mockReturnValue(false);
+      const start = await service.start({ http, injectedMetadata });
+
+      start.navigateToApp('myTestApp', { path: 'deep/link/to/location/2' });
+      expect(MockHistory.push).toHaveBeenCalledWith(
+        '/app/myTestApp/deep/link/to/location/2',
+        undefined
+      );
+    });
+
+    it('includes state if specified', async () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      service.setup({ context });
+
+      const http = httpServiceMock.createStartContract();
+      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+      injectedMetadata.getLegacyMode.mockReturnValue(false);
+      const start = await service.start({ http, injectedMetadata });
+
+      start.navigateToApp('myTestApp', { state: 'my-state' });
+      expect(MockHistory.push).toHaveBeenCalledWith('/app/myTestApp', 'my-state');
+    });
+
+    it('redirects when in legacyMode', async () => {
+      const service = new ApplicationService();
+      const context = contextServiceMock.createSetupContract();
+      service.setup({ context });
+
+      const http = httpServiceMock.createStartContract();
+      const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+      injectedMetadata.getLegacyMode.mockReturnValue(true);
+      const redirectTo = jest.fn();
+      const start = await service.start({ http, injectedMetadata, redirectTo });
+      start.navigateToApp('myTestApp');
+      expect(redirectTo).toHaveBeenCalledWith('/app/myTestApp');
+    });
+  });
 });
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 528b81ad40be7c..62178eebf0d705 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -17,108 +17,44 @@
  * under the License.
  */
 
-import { Observable, BehaviorSubject } from 'rxjs';
-import { CapabilitiesService, Capabilities } from './capabilities';
-import { InjectedMetadataStart } from '../injected_metadata';
-import { RecursiveReadonly } from '../../utils';
-
-interface BaseApp {
-  id: string;
-
-  /**
-   * An ordinal used to sort nav links relative to one another for display.
-   */
-  order: number;
-
-  /**
-   * The title of the application.
-   */
-  title: string;
-
-  /**
-   * An observable for a tooltip shown when hovering over app link.
-   */
-  tooltip$?: Observable<string>;
-
-  /**
-   * A EUI iconType that will be used for the app's icon. This icon
-   * takes precendence over the `icon` property.
-   */
-  euiIconType?: string;
-
-  /**
-   * A URL to an image file used as an icon. Used as a fallback
-   * if `euiIconType` is not provided.
-   */
-  icon?: string;
-
-  /**
-   * Custom capabilities defined by the app.
-   */
-  capabilities?: Partial<Capabilities>;
-}
-
-/** @public */
-export interface App extends BaseApp {
-  /**
-   * A mount function called when the user navigates to this app's `rootRoute`.
-   * @param targetDomElement An HTMLElement to mount the application onto.
-   * @returns An unmounting function that will be called to unmount the application.
-   */
-  mount(targetDomElement: HTMLElement): () => void;
-}
-
-/** @internal */
-export interface LegacyApp extends BaseApp {
-  appUrl: string;
-  subUrlBase?: string;
-  linkToLastSubUrl?: boolean;
-}
-
-/** @internal */
-export type MixedApp = Partial<App> & Partial<LegacyApp> & BaseApp;
+import { createBrowserHistory } from 'history';
+import { BehaviorSubject } from 'rxjs';
+import React from 'react';
 
-/** @public */
-export interface ApplicationSetup {
-  /**
-   * Register an mountable application to the system. Apps will be mounted based on their `rootRoute`.
-   * @param app
-   */
-  registerApp(app: App): void;
-
-  /**
-   * Register metadata about legacy applications. Legacy apps will not be mounted when navigated to.
-   * @param app
-   * @internal
-   */
-  registerLegacyApp(app: LegacyApp): void;
+import { InjectedMetadataStart } from '../injected_metadata';
+import { CapabilitiesService } from './capabilities';
+import { AppRouter } from './ui';
+import { HttpStart } from '../http';
+import { IContextContainer } from '../context';
+import { ContextSetup } from '../context/context_service';
+import {
+  AppMountContext,
+  App,
+  LegacyApp,
+  AppMounter,
+  AppUnmount,
+  AppMountParameters,
+  InternalApplicationSetup,
+  InternalApplicationStart,
+} from './types';
+
+interface SetupDeps {
+  context: ContextSetup;
 }
 
-/**
- * @public
- */
-export interface ApplicationStart {
-  /**
-   * Gets the read-only capabilities.
-   */
-  capabilities: RecursiveReadonly<Capabilities>;
-
-  /**
-   * Apps available based on the current capabilities. Should be used
-   * to show navigation links and make routing decisions.
-   */
-  availableApps: readonly App[];
-
+interface StartDeps {
+  http: HttpStart;
+  injectedMetadata: InjectedMetadataStart;
   /**
-   * Apps available based on the current capabilities. Should be used
-   * to show navigation links and make routing decisions.
-   * @internal
+   * Only necessary for redirecting to legacy apps
+   * @deprecated
    */
-  availableLegacyApps: readonly LegacyApp[];
+  redirectTo?: (path: string) => void;
 }
 
-interface StartDeps {
-  injectedMetadata: InjectedMetadataStart;
+interface AppBox {
+  app: App;
+  mount: AppMounter;
 }
 
 /**
@@ -126,30 +62,116 @@ interface StartDeps {
  * @internal
  */
 export class ApplicationService {
-  private readonly apps$ = new BehaviorSubject<App[]>([]);
-  private readonly legacyApps$ = new BehaviorSubject<LegacyApp[]>([]);
+  private readonly apps$ = new BehaviorSubject<ReadonlyMap<string, AppBox>>(new Map());
+  private readonly legacyApps$ = new BehaviorSubject<ReadonlyMap<string, LegacyApp>>(new Map());
   private readonly capabilities = new CapabilitiesService();
+  private mountContext?: IContextContainer<
+    AppMountContext,
+    AppUnmount | Promise<AppUnmount>,
+    [AppMountParameters]
+  >;
+
+  public setup({ context }: SetupDeps): InternalApplicationSetup {
+    this.mountContext = context.createContextContainer();
 
-  public setup(): ApplicationSetup {
     return {
-      registerApp: (app: App) => {
-        this.apps$.next([...this.apps$.value, app]);
+      register: (plugin: symbol, app: App) => {
+        if (this.apps$.value.has(app.id)) {
+          throw new Error(`An application is already registered with the id "${app.id}"`);
+        }
+        if (this.apps$.isStopped) {
+          throw new Error(`Applications cannot be registered after "setup"`);
+        }
+
+        const appBox: AppBox = {
+          app,
+          mount: this.mountContext!.createHandler(plugin, app.mount),
+        };
+        this.apps$.next(new Map([...this.apps$.value.entries(), [app.id, appBox]]));
       },
       registerLegacyApp: (app: LegacyApp) => {
-        this.legacyApps$.next([...this.legacyApps$.value, app]);
+        if (this.legacyApps$.value.has(app.id)) {
+          throw new Error(`A legacy application is already registered with the id "${app.id}"`);
+        }
+        if (this.apps$.isStopped) {
+          throw new Error(`Applications cannot be registered after "setup"`);
+        }
+
+        this.legacyApps$.next(new Map([...this.legacyApps$.value.entries(), [app.id, app]]));
       },
+      registerMountContext: this.mountContext.registerContext,
     };
   }
 
-  public async start({ injectedMetadata }: StartDeps): Promise<ApplicationStart> {
+  public async start({
+    http,
+    injectedMetadata,
+    redirectTo = (path: string) => (window.location.href = path),
+  }: StartDeps): Promise<InternalApplicationStart> {
+    if (!this.mountContext) {
+      throw new Error(`ApplicationService#setup() must be invoked before start.`);
+    }
+
+    // Disable registration of new applications
     this.apps$.complete();
     this.legacyApps$.complete();
 
-    return this.capabilities.start({
-      apps: this.apps$.value,
+    const legacyMode = injectedMetadata.getLegacyMode();
+    const currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
+    const { availableApps, availableLegacyApps, capabilities } = await this.capabilities.start({
+      apps: new Map([...this.apps$.value].map(([id, { app }]) => [id, app])),
       legacyApps: this.legacyApps$.value,
       injectedMetadata,
     });
+
+    // Only setup history if we're not in legacy mode
+    const history = legacyMode ? null : createBrowserHistory({ basename: http.basePath.get() });
+
+    return {
+      availableApps,
+      availableLegacyApps,
+      capabilities,
+      registerMountContext: this.mountContext.registerContext,
+      currentAppId$,
+
+      navigateToApp: (appId, { path, state }: { path?: string; state?: any } = {}) => {
+        let appPath: string;
+        if (path) {
+          const pathWithoutPrecedingSlash = path.replace(/^\//, '');
+          appPath = `/app/${appId}/${pathWithoutPrecedingSlash}`;
+        } else {
+          appPath = `/app/${appId}`;
+        }
+
+        if (legacyMode) {
+          // If we're in legacy mode, do a full page refresh to load the NP app.
+          redirectTo(http.basePath.prepend(appPath));
+        } else {
+          // basePath not needed here because `history` is configured with basename
+          history!.push(appPath, state);
+        }
+      },
+
+      getComponent: () => {
+        // Filter only available apps and map to just the mount function.
+        const appMounters = new Map<string, AppMounter>(
+          [...this.apps$.value]
+            .filter(([id]) => availableApps.has(id))
+            .map(([id, { mount }]) => [id, mount])
+        );
+
+        return legacyMode ? null : (
+          <AppRouter
+            apps={appMounters}
+            legacyApps={availableLegacyApps}
+            basePath={http.basePath}
+            currentAppId$={currentAppId$}
+            history={history!}
+            redirectTo={redirectTo}
+          />
+        );
+      },
+    };
   }
 
   public stop() {}
diff --git a/src/core/public/application/capabilities/capabilities_service.mock.ts b/src/core/public/application/capabilities/capabilities_service.mock.ts
index 71b069fd80434e..29c3275f0e3b27 100644
--- a/src/core/public/application/capabilities/capabilities_service.mock.ts
+++ b/src/core/public/application/capabilities/capabilities_service.mock.ts
@@ -18,11 +18,11 @@
  */
 import { CapabilitiesService, CapabilitiesStart } from './capabilities_service';
 import { deepFreeze } from '../../../utils/';
-import { App, LegacyApp } from '../application_service';
+import { App, LegacyApp } from '../types';
 
 const createStartContractMock = (
-  apps: readonly App[] = [],
-  legacyApps: readonly LegacyApp[] = []
+  apps: ReadonlyMap<string, App> = new Map(),
+  legacyApps: ReadonlyMap<string, LegacyApp> = new Map()
 ): jest.Mocked<CapabilitiesStart> => ({
   availableApps: apps,
   availableLegacyApps: legacyApps,
diff --git a/src/core/public/application/capabilities/capabilities_service.test.ts b/src/core/public/application/capabilities/capabilities_service.test.ts
index 1c60c1eeb195aa..e80e9a7af321a8 100644
--- a/src/core/public/application/capabilities/capabilities_service.test.ts
+++ b/src/core/public/application/capabilities/capabilities_service.test.ts
@@ -19,6 +19,7 @@
 
 import { InjectedMetadataService } from '../../injected_metadata';
 import { CapabilitiesService } from './capabilities_service';
+import { LegacyApp, App } from '../types';
 
 describe('#start', () => {
   const injectedMetadata = new InjectedMetadataService({
@@ -39,17 +40,22 @@ describe('#start', () => {
     } as any,
   }).start();
 
-  const apps = [{ id: 'app1' }, { id: 'app2', capabilities: { app2: { feature: true } } }] as any;
-  const legacyApps = [
-    { id: 'legacyApp1' },
-    { id: 'legacyApp2', capabilities: { app2: { feature: true } } },
-  ] as any;
+  const apps = new Map([
+    ['app1', { id: 'app1' }],
+    ['app2', { id: 'app2', capabilities: { app2: { feature: true } } }],
+  ] as Array<[string, App]>);
+  const legacyApps = new Map([
+    ['legacyApp1', { id: 'legacyApp1' }],
+    ['legacyApp2', { id: 'legacyApp2', capabilities: { app2: { feature: true } } }],
+  ] as Array<[string, LegacyApp]>);
 
   it('filters available apps based on returned navLinks', async () => {
     const service = new CapabilitiesService();
     const startContract = await service.start({ apps, legacyApps, injectedMetadata });
-    expect(startContract.availableApps).toEqual([{ id: 'app1' }]);
-    expect(startContract.availableLegacyApps).toEqual([{ id: 'legacyApp1' }]);
+    expect(startContract.availableApps).toEqual(new Map([['app1', { id: 'app1' }]]));
+    expect(startContract.availableLegacyApps).toEqual(
+      new Map([['legacyApp1', { id: 'legacyApp1' }]])
+    );
   });
 
   it('does not allow Capabilities to be modified', async () => {
diff --git a/src/core/public/application/capabilities/capabilities_service.tsx b/src/core/public/application/capabilities/capabilities_service.tsx
index 51c5a218e70bd3..b5be7b9304c89d 100644
--- a/src/core/public/application/capabilities/capabilities_service.tsx
+++ b/src/core/public/application/capabilities/capabilities_service.tsx
@@ -18,12 +18,12 @@
  */
 
 import { deepFreeze, RecursiveReadonly } from '../../../utils';
-import { LegacyApp, App } from '../application_service';
+import { LegacyApp, App } from '../types';
 import { InjectedMetadataStart } from '../../injected_metadata';
 
 interface StartDeps {
-  apps: readonly App[];
-  legacyApps: readonly LegacyApp[];
+  apps: ReadonlyMap<string, App>;
+  legacyApps: ReadonlyMap<string, LegacyApp>;
   injectedMetadata: InjectedMetadataStart;
 }
 
@@ -53,8 +53,8 @@ export interface Capabilities {
 /** @internal */
 export interface CapabilitiesStart {
   capabilities: RecursiveReadonly<Capabilities>;
-  availableApps: readonly App[];
-  availableLegacyApps: readonly LegacyApp[];
+  availableApps: ReadonlyMap<string, App>;
+  availableLegacyApps: ReadonlyMap<string, LegacyApp>;
 }
 
 /**
@@ -68,10 +68,23 @@ export class CapabilitiesService {
     injectedMetadata,
   }: StartDeps): Promise<CapabilitiesStart> {
     const capabilities = deepFreeze(injectedMetadata.getCapabilities());
+    const availableApps = new Map(
+      [...apps.entries()].filter(
+        ([appId]) =>
+          capabilities.navLinks[appId] === undefined || capabilities.navLinks[appId] === true
+      )
+    );
+
+    const availableLegacyApps = new Map(
+      [...legacyApps.entries()].filter(
+        ([appId]) =>
+          capabilities.navLinks[appId] === undefined || capabilities.navLinks[appId] === true
+      )
+    );
 
     return {
-      availableApps: apps.filter(app => capabilities.navLinks[app.id]),
-      availableLegacyApps: legacyApps.filter(app => capabilities.navLinks[app.id]),
+      availableApps,
+      availableLegacyApps,
       capabilities,
     };
   }
diff --git a/src/core/public/application/index.ts b/src/core/public/application/index.ts
index 137b46e6573e6d..ae25b54cf07a84 100644
--- a/src/core/public/application/index.ts
+++ b/src/core/public/application/index.ts
@@ -17,5 +17,17 @@
  * under the License.
  */
 
-export { ApplicationService, ApplicationSetup, ApplicationStart } from './application_service';
+export { ApplicationService } from './application_service';
 export { Capabilities } from './capabilities';
+export {
+  App,
+  AppBase,
+  AppUnmount,
+  AppMountContext,
+  AppMountParameters,
+  ApplicationSetup,
+  ApplicationStart,
+  // Internal types
+  InternalApplicationStart,
+  LegacyApp,
+} from './types';
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
new file mode 100644
index 00000000000000..88346eded86f27
--- /dev/null
+++ b/src/core/public/application/types.ts
@@ -0,0 +1,293 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Observable, Subject } from 'rxjs';
+
+import { Capabilities } from './capabilities';
+import { ChromeStart } from '../chrome';
+import { IContextProvider } from '../context';
+import { DocLinksStart } from '../doc_links';
+import { HttpStart } from '../http';
+import { I18nStart } from '../i18n';
+import { NotificationsStart } from '../notifications';
+import { OverlayStart } from '../overlays';
+import { PluginOpaqueId } from '../plugins';
+import { UiSettingsClientContract } from '../ui_settings';
+import { RecursiveReadonly } from '../../utils';
+
+/** @public */
+export interface AppBase {
+  id: string;
+
+  /**
+   * The title of the application.
+   */
+  title: string;
+
+  /**
+   * An ordinal used to sort nav links relative to one another for display.
+   */
+  order?: number;
+
+  /**
+   * An observable for a tooltip shown when hovering over app link.
+   */
+  tooltip$?: Observable<string>;
+
+  /**
+   * A EUI iconType that will be used for the app's icon. This icon
+   * takes precendence over the `icon` property.
+   */
+  euiIconType?: string;
+
+  /**
+   * A URL to an image file used as an icon. Used as a fallback
+   * if `euiIconType` is not provided.
+   */
+  icon?: string;
+
+  /**
+   * Custom capabilities defined by the app.
+   */
+  capabilities?: Partial<Capabilities>;
+}
+
+/**
+ * Extension of {@link AppBase | common app properties} with the mount function.
+ * @public
+ */
+export interface App extends AppBase {
+  /**
+   * A mount function called when the user navigates to this app's `rootRoute`.
+   * @param context The mount context for this app.
+   * @param targetDomElement An HTMLElement to mount the application onto.
+   * @returns An unmounting function that will be called to unmount the application.
+   */
+  mount: (context: AppMountContext, params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
+}
+
+/** @internal */
+export interface LegacyApp extends AppBase {
+  appUrl: string;
+  subUrlBase?: string;
+  linkToLastSubUrl?: boolean;
+}
+
+/**
+ * The context object received when applications are mounted to the DOM.
+ * @public
+ */
+export interface AppMountContext {
+  /**
+   * Core service APIs available to mounted applications.
+   */
+  core: {
+    /** {@link ApplicationStart} */
+    application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp'>;
+    /** {@link ChromeStart} */
+    chrome: ChromeStart;
+    /** {@link DocLinksStart} */
+    docLinks: DocLinksStart;
+    /** {@link HttpStart} */
+    http: HttpStart;
+    /** {@link I18nStart} */
+    i18n: I18nStart;
+    /** {@link NotificationsStart} */
+    notifications: NotificationsStart;
+    /** {@link OverlayStart} */
+    overlays: OverlayStart;
+    /** {@link UiSettingsClient} */
+    uiSettings: UiSettingsClientContract;
+  };
+}
+
+/** @public */
+export interface AppMountParameters {
+  /**
+   * The container element to render the application into.
+   */
+  element: HTMLElement;
+
+  /**
+   * The base path for configuring the application's router.
+   *
+   * @example
+   *
+   * How to configure react-router with a base path:
+   *
+   * ```ts
+   * // inside your plugin's setup function
+   * export class MyPlugin implements Plugin {
+   *   setup({ application }) {
+   *     application.register({
+   *     id: 'my-app',
+   *     async mount(context, params) {
+   *       const { renderApp } = await import('./applcation');
+   *       return renderApp(context, params);
+   *     },
+   *   });
+   * }
+   * ```
+   *
+   * ```ts
+   * // application.tsx
+   * import React from 'react';
+   * import ReactDOM from 'react-dom';
+   * import { BrowserRouter, Route } from 'react-router-dom';
+   *
+   * export renderApp = (context, { appBasePath, element }) => {
+   *   ReactDOM.render(
+   *     // pass `appBasePath` to `basename`
+   *     <BrowserRouter basename={appBasePath}>
+   *       <Route path="/" exact component={HomePage} />
+   *     </BrowserRouter>,
+   *     element
+   *   );
+   *
+   *   return () => ReactDOM.unmountComponentAtNode(element);
+   * }
+   * ```
+   */
+  appBasePath: string;
+}
+
+/**
+ * A function called when an application should be unmounted from the page. This function should be synchronous.
+ * @public
+ */
+export type AppUnmount = () => void;
+
+/** @internal */
+export type AppMounter = (params: AppMountParameters) => Promise<AppUnmount>;
+
+/** @public */
+export interface ApplicationSetup {
+  /**
+   * Register an mountable application to the system. Apps will be mounted based on their `rootRoute`.
+   * @param app
+   */
+  register(app: App): void;
+
+  /**
+   * Register a context provider for application mounting. Will only be available to applications that depend on the
+   * plugin that registered this context.
+   *
+   * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
+   * @param provider - A {@link IContextProvider} function
+   */
+  registerMountContext<T extends keyof AppMountContext>(
+    contextName: T,
+    provider: IContextProvider<AppMountContext, keyof AppMountContext>
+  ): void;
+}
+
+/** @internal */
+export interface InternalApplicationSetup {
+  /**
+   * Register an mountable application to the system. Apps will be mounted based on their `rootRoute`.
+   * @param plugin - opaque ID of the plugin that registers this application
+   * @param app
+   */
+  register(plugin: symbol, app: App): void;
+
+  /**
+   * Register metadata about legacy applications. Legacy apps will not be mounted when navigated to.
+   * @param app
+   * @internal
+   */
+  registerLegacyApp(app: LegacyApp): void;
+
+  /**
+   * Register a context provider for application mounting. Will only be available to applications that depend on the
+   * plugin that registered this context.
+   *
+   * @param pluginOpaqueId - The opaque ID of the plugin that is registering the context.
+   * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
+   * @param provider - A {@link IContextProvider} function
+   */
+  registerMountContext<T extends keyof AppMountContext>(
+    pluginOpaqueId: symbol,
+    contextName: T,
+    provider: IContextProvider<AppMountContext, keyof AppMountContext>
+  ): void;
+}
+
+/** @public */
+export interface ApplicationStart {
+  /**
+   * Gets the read-only capabilities.
+   */
+  capabilities: RecursiveReadonly<Capabilities>;
+
+  /**
+   * Navigiate to a given app
+   *
+   * @param appId
+   * @param options.path - optional path inside application to deep link to
+   * @param options.state - optional state to forward to the application
+   */
+  navigateToApp(appId: string, options?: { path?: string; state?: any }): void;
+
+  /**
+   * Register a context provider for application mounting. Will only be available to applications that depend on the
+   * plugin that registered this context.
+   *
+   * @param pluginOpaqueId - The opaque ID of the plugin that is registering the context.
+   * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
+   * @param provider - A {@link IContextProvider} function
+   */
+  registerMountContext<T extends keyof AppMountContext>(
+    contextName: T,
+    provider: IContextProvider<AppMountContext, T>
+  ): void;
+}
+
+/** @internal */
+export interface InternalApplicationStart
+  extends Pick<ApplicationStart, 'capabilities' | 'navigateToApp'> {
+  /**
+   * Apps available based on the current capabilities. Should be used
+   * to show navigation links and make routing decisions.
+   */
+  availableApps: ReadonlyMap<string, App>;
+  /**
+   * Apps available based on the current capabilities. Should be used
+   * to show navigation links and make routing decisions.
+   * @internal
+   */
+  availableLegacyApps: ReadonlyMap<string, LegacyApp>;
+
+  /**
+   * Register a context provider for application mounting. Will only be available to applications that depend on the
+   * plugin that registered this context.
+   *
+   * @param pluginOpaqueId - The opaque ID of the plugin that is registering the context.
+   * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
+   * @param provider - A {@link IContextProvider} function
+   */
+  registerMountContext<T extends keyof AppMountContext>(
+    pluginOpaqueId: PluginOpaqueId,
+    contextName: T,
+    provider: IContextProvider<AppMountContext, T>
+  ): void;
+
+  // Internal APIs
+  currentAppId$: Subject<string | undefined>;
+  getComponent(): JSX.Element | null;
+}
diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
new file mode 100644
index 00000000000000..1c54f9aa54b6a9
--- /dev/null
+++ b/src/core/public/application/ui/app_container.tsx
@@ -0,0 +1,115 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { RouteComponentProps } from 'react-router-dom';
+import { Subject } from 'rxjs';
+
+import { LegacyApp, AppMounter, AppUnmount } from '../types';
+import { HttpStart } from '../../http';
+import { AppNotFound } from './app_not_found_screen';
+
+interface Props extends RouteComponentProps<{ appId: string }> {
+  apps: ReadonlyMap<string, AppMounter>;
+  legacyApps: ReadonlyMap<string, LegacyApp>;
+  basePath: HttpStart['basePath'];
+  currentAppId$: Subject<string | undefined>;
+  /**
+   * Only necessary for redirecting to legacy apps
+   * @deprecated
+   */
+  redirectTo: (path: string) => void;
+}
+
+interface State {
+  appNotFound: boolean;
+}
+
+export class AppContainer extends React.Component<Props, State> {
+  private readonly containerDiv = React.createRef<HTMLDivElement>();
+  private unmountFunc?: AppUnmount;
+
+  constructor(props: Props) {
+    super(props);
+    this.state = { appNotFound: false };
+  }
+
+  componentDidMount() {
+    this.mountApp();
+  }
+
+  componentWillUnmount() {
+    this.unmountApp();
+  }
+
+  componentDidUpdate(prevProps: Props) {
+    if (prevProps.match.params.appId !== this.props.match.params.appId) {
+      this.unmountApp();
+      this.mountApp();
+    }
+  }
+
+  async mountApp() {
+    const { apps, legacyApps, match, basePath, currentAppId$, redirectTo } = this.props;
+    const appId = match.params.appId;
+
+    const mount = apps.get(appId);
+    if (mount) {
+      this.unmountFunc = await mount({
+        appBasePath: basePath.prepend(`/app/${appId}`),
+        element: this.containerDiv.current!,
+      });
+      currentAppId$.next(appId);
+      this.setState({ appNotFound: false });
+      return;
+    }
+
+    const legacyApp = findLegacyApp(appId, legacyApps);
+    if (legacyApp) {
+      // Give the current app a chance to shutdown
+      await this.unmountApp();
+      redirectTo(basePath.prepend(`/app/${appId}`));
+      this.setState({ appNotFound: false });
+      return;
+    }
+
+    this.setState({ appNotFound: true });
+  }
+
+  async unmountApp() {
+    if (this.unmountFunc) {
+      await this.unmountFunc();
+      this.unmountFunc = undefined;
+    }
+  }
+
+  render() {
+    return (
+      <React.Fragment>
+        {this.state.appNotFound && <AppNotFound />}
+        <div key={this.props.match.params.appId} ref={this.containerDiv} />
+      </React.Fragment>
+    );
+  }
+}
+
+function findLegacyApp(appId: string, apps: ReadonlyMap<string, LegacyApp>) {
+  const matchingApps = [...apps.entries()].filter(([id]) => id.split(':')[0] === appId);
+  return matchingApps.length ? matchingApps[0][1] : null;
+}
diff --git a/src/core/public/application/ui/app_not_found_screen.tsx b/src/core/public/application/ui/app_not_found_screen.tsx
new file mode 100644
index 00000000000000..73a999c5dbf162
--- /dev/null
+++ b/src/core/public/application/ui/app_not_found_screen.tsx
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EuiEmptyPrompt, EuiPage, EuiPageBody, EuiPageContent } from '@elastic/eui';
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export const AppNotFound = () => (
+  <EuiPage style={{ minHeight: '100%' }}>
+    <EuiPageBody>
+      <EuiPageContent verticalPosition="center" horizontalPosition="center">
+        <EuiEmptyPrompt
+          iconType="alert"
+          iconColor="danger"
+          title={
+            <h2>
+              <FormattedMessage
+                id="core.application.appNotFound.title"
+                defaultMessage="Application Not Found"
+              />
+            </h2>
+          }
+          body={
+            <p>
+              <FormattedMessage
+                id="core.application.appNotFound.pageDescription"
+                defaultMessage="No application was found at this URL. Try going back or choosing an app from the menu."
+              />
+            </p>
+          }
+        />
+      </EuiPageContent>
+    </EuiPageBody>
+  </EuiPage>
+);
diff --git a/src/core/public/application/ui/app_router.tsx b/src/core/public/application/ui/app_router.tsx
new file mode 100644
index 00000000000000..9d8acf19785567
--- /dev/null
+++ b/src/core/public/application/ui/app_router.tsx
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { History } from 'history';
+import React from 'react';
+import { Router, Route } from 'react-router-dom';
+import { Subject } from 'rxjs';
+
+import { LegacyApp, AppMounter } from '../types';
+import { AppContainer } from './app_container';
+import { HttpStart } from '../../http';
+
+interface Props {
+  apps: ReadonlyMap<string, AppMounter>;
+  legacyApps: ReadonlyMap<string, LegacyApp>;
+  basePath: HttpStart['basePath'];
+  currentAppId$: Subject<string | undefined>;
+  history: History;
+  /**
+   * Only necessary for redirecting to legacy apps
+   * @deprecated
+   */
+  redirectTo?: (path: string) => void;
+}
+
+export const AppRouter: React.StatelessComponent<Props> = ({
+  history,
+  redirectTo = (path: string) => (window.location.href = path),
+  ...otherProps
+}) => (
+  <Router history={history}>
+    <Route
+      path="/app/:appId"
+      render={props => <AppContainer redirectTo={redirectTo} {...otherProps} {...props} />}
+    />
+  </Router>
+);
diff --git a/src/core/public/application/ui/index.ts b/src/core/public/application/ui/index.ts
new file mode 100644
index 00000000000000..65d04bab5fa03d
--- /dev/null
+++ b/src/core/public/application/ui/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { AppRouter } from './app_router';
diff --git a/src/core/public/application/ui/ui_integration.test.tsx b/src/core/public/application/ui/ui_integration.test.tsx
new file mode 100644
index 00000000000000..d8cd9c616c8f1f
--- /dev/null
+++ b/src/core/public/application/ui/ui_integration.test.tsx
@@ -0,0 +1,131 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { mount, ReactWrapper } from 'enzyme';
+import { createMemoryHistory, History } from 'history';
+import { BehaviorSubject } from 'rxjs';
+
+import { I18nProvider } from '@kbn/i18n/react';
+
+import { AppMounter, LegacyApp, AppMountParameters } from '../types';
+import { httpServiceMock } from '../../http/http_service.mock';
+import { AppRouter } from './app_router';
+import { AppNotFound } from './app_not_found_screen';
+
+const createMountHandler = (htmlString: string) =>
+  jest.fn(async ({ appBasePath: basename, element: el }: AppMountParameters) => {
+    ReactDOM.render(
+      <div
+        dangerouslySetInnerHTML={{ __html: `\nbasename: ${basename}\nhtml: ${htmlString}\n` }}
+      />,
+      el
+    );
+    return jest.fn(() => ReactDOM.unmountComponentAtNode(el));
+  });
+
+describe('AppContainer', () => {
+  let apps: Map<string, jest.Mock<ReturnType<AppMounter>, Parameters<AppMounter>>>;
+  let legacyApps: Map<string, LegacyApp>;
+  let history: History;
+  let router: ReactWrapper;
+  let redirectTo: jest.Mock<void, [string]>;
+  let currentAppId$: BehaviorSubject<string | undefined>;
+
+  const navigate = async (path: string) => {
+    history.push(path);
+    router.update();
+    // flushes any pending promises
+    return new Promise(resolve => setImmediate(resolve));
+  };
+
+  beforeEach(() => {
+    redirectTo = jest.fn();
+    apps = new Map([
+      ['app1', createMountHandler('<span>App 1</span>')],
+      ['app2', createMountHandler('<div>App 2</div>')],
+    ]);
+    legacyApps = new Map([
+      ['legacyApp1', { id: 'legacyApp1' }],
+      ['baseApp:legacyApp2', { id: 'baseApp:legacyApp2' }],
+    ]) as Map<string, LegacyApp>;
+    history = createMemoryHistory();
+    currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
+    // Use 'asdf' as the basepath
+    const http = httpServiceMock.createStartContract('/asdf');
+    router = mount(
+      <I18nProvider>
+        <AppRouter
+          redirectTo={redirectTo}
+          history={history}
+          apps={apps}
+          legacyApps={legacyApps}
+          basePath={http.basePath}
+          currentAppId$={currentAppId$}
+        />
+      </I18nProvider>
+    );
+  });
+
+  it('calls mountHandler and returned unmount function when navigating between apps', async () => {
+    await navigate('/app/app1');
+    expect(apps.get('app1')!).toHaveBeenCalled();
+    expect(router.html()).toMatchInlineSnapshot(`
+      "<div><div>
+      basename: /asdf/app/app1
+      html: <span>App 1</span>
+      </div></div>"
+    `);
+
+    const app1Unmount = await apps.get('app1')!.mock.results[0].value;
+    await navigate('/app/app2');
+    expect(app1Unmount).toHaveBeenCalled();
+
+    expect(apps.get('app2')!).toHaveBeenCalled();
+    expect(router.html()).toMatchInlineSnapshot(`
+      "<div><div>
+      basename: /asdf/app/app2
+      html: <div>App 2</div>
+      </div></div>"
+    `);
+  });
+
+  it('updates currentApp$ after mounting', async () => {
+    await navigate('/app/app1');
+    expect(currentAppId$.value).toEqual('app1');
+    await navigate('/app/app2');
+    expect(currentAppId$.value).toEqual('app2');
+  });
+
+  it('sets window.location.href when navigating to legacy apps', async () => {
+    await navigate('/app/legacyApp1');
+    expect(redirectTo).toHaveBeenCalledWith('/asdf/app/legacyApp1');
+  });
+
+  it('handles legacy apps with subapps', async () => {
+    await navigate('/app/baseApp');
+    expect(redirectTo).toHaveBeenCalledWith('/asdf/app/baseApp');
+  });
+
+  it('displays error page if no app is found', async () => {
+    await navigate('/app/unknown');
+    expect(router.exists(AppNotFound)).toBe(true);
+  });
+});
diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
index 392846f8433ba7..9a7d87b449b19c 100644
--- a/src/core/public/chrome/chrome_service.test.ts
+++ b/src/core/public/chrome/chrome_service.test.ts
@@ -38,7 +38,7 @@ const store = new Map();
 
 function defaultStartDeps() {
   return {
-    application: applicationServiceMock.createStartContract(),
+    application: applicationServiceMock.createInternalStartContract(),
     docLinks: docLinksServiceMock.createStartContract(),
     http: httpServiceMock.createStartContract(),
     injectedMetadata: injectedMetadataServiceMock.createStartContract(),
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 668bce522bf4eb..0fd68619b73cf1 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -27,7 +27,7 @@ import { IconType } from '@elastic/eui';
 
 import { InjectedMetadataStart } from '../injected_metadata';
 import { NotificationsStart } from '../notifications';
-import { ApplicationStart } from '../application';
+import { InternalApplicationStart } from '../application';
 import { HttpStart } from '../http';
 
 import { ChromeNavLinks, NavLinksService } from './nav_links';
@@ -73,7 +73,7 @@ interface ConstructorParams {
 }
 
 interface StartDeps {
-  application: ApplicationStart;
+  application: InternalApplicationStart;
   docLinks: DocLinksStart;
   http: HttpStart;
   injectedMetadata: InjectedMetadataStart;
@@ -83,14 +83,11 @@ interface StartDeps {
 /** @internal */
 export class ChromeService {
   private readonly stop$ = new ReplaySubject(1);
-  private readonly browserSupportsCsp: boolean;
   private readonly navControls = new NavControlsService();
   private readonly navLinks = new NavLinksService();
   private readonly recentlyAccessed = new RecentlyAccessedService();
 
-  constructor({ browserSupportsCsp }: ConstructorParams) {
-    this.browserSupportsCsp = browserSupportsCsp;
-  }
+  constructor(private readonly params: ConstructorParams) {}
 
   public async start({
     application,
@@ -114,7 +111,7 @@ export class ChromeService {
     const navLinks = this.navLinks.start({ application, http });
     const recentlyAccessed = await this.recentlyAccessed.start({ http });
 
-    if (!this.browserSupportsCsp && injectedMetadata.getCspConfig().warnLegacyBrowsers) {
+    if (!this.params.browserSupportsCsp && injectedMetadata.getCspConfig().warnLegacyBrowsers) {
       notifications.toasts.addWarning(
         i18n.translate('core.chrome.legacyBrowserWarning', {
           defaultMessage: 'Your browser does not meet the security requirements for Kibana.',
@@ -137,6 +134,7 @@ export class ChromeService {
               badge$={badge$.pipe(takeUntil(this.stop$))}
               basePath={http.basePath}
               breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
+              currentAppId$={application.currentAppId$}
               kibanaDocLink={docLinks.links.kibana}
               forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
               helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
@@ -146,7 +144,9 @@ export class ChromeService {
                 takeUntil(this.stop$)
               )}
               kibanaVersion={injectedMetadata.getKibanaVersion()}
+              legacyMode={injectedMetadata.getLegacyMode()}
               navLinks$={navLinks.getNavLinks$()}
+              navigateToApp={application.navigateToApp}
               recentlyAccessed$={recentlyAccessed.get$()}
               navControlsLeft$={navControls.getLeft$()}
               navControlsRight$={navControls.getRight$()}
diff --git a/src/core/public/chrome/nav_links/nav_link.ts b/src/core/public/chrome/nav_links/nav_link.ts
index b323bf5318b230..d87d171e028e17 100644
--- a/src/core/public/chrome/nav_links/nav_link.ts
+++ b/src/core/public/chrome/nav_links/nav_link.ts
@@ -28,11 +28,6 @@ export interface ChromeNavLink {
    */
   readonly id: string;
 
-  /**
-   * An ordinal used to sort nav links relative to one another for display.
-   */
-  readonly order: number;
-
   /**
    * The title of the application.
    */
@@ -43,6 +38,11 @@ export interface ChromeNavLink {
    */
   readonly baseUrl: string;
 
+  /**
+   * An ordinal used to sort nav links relative to one another for display.
+   */
+  readonly order?: number;
+
   /**
    * A tooltip shown when hovering over an app link.
    */
diff --git a/src/core/public/chrome/nav_links/nav_links_service.test.ts b/src/core/public/chrome/nav_links/nav_links_service.test.ts
index dfef8dc7989f6f..8c135b3c4c49f0 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.test.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.test.ts
@@ -19,20 +19,27 @@
 
 import { NavLinksService } from './nav_links_service';
 import { take, map, takeLast } from 'rxjs/operators';
+import { LegacyApp } from '../../application';
 
 const mockAppService = {
-  availableApps: [],
-  availableLegacyApps: [
-    { id: 'legacyApp1', order: 0, title: 'Legacy App 1', icon: 'legacyApp1', appUrl: '/app1' },
-    {
-      id: 'legacyApp2',
-      order: -10,
-      title: 'Legacy App 2',
-      euiIconType: 'canvasApp',
-      appUrl: '/app2',
-    },
-    { id: 'legacyApp3', order: 20, title: 'Legacy App 3', appUrl: '/app3' },
-  ],
+  availableApps: new Map(),
+  availableLegacyApps: new Map<string, LegacyApp>([
+    [
+      'legacyApp1',
+      { id: 'legacyApp1', order: 0, title: 'Legacy App 1', icon: 'legacyApp1', appUrl: '/app1' },
+    ],
+    [
+      'legacyApp2',
+      {
+        id: 'legacyApp2',
+        order: -10,
+        title: 'Legacy App 2',
+        euiIconType: 'canvasApp',
+        appUrl: '/app2',
+      },
+    ],
+    ['legacyApp3', { id: 'legacyApp3', order: 20, title: 'Legacy App 3', appUrl: '/app3' }],
+  ]),
 } as any;
 
 const mockHttp = {
diff --git a/src/core/public/chrome/nav_links/nav_links_service.ts b/src/core/public/chrome/nav_links/nav_links_service.ts
index 2250ec40f0f441..5254012665eaf9 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.ts
@@ -21,11 +21,11 @@ import { sortBy } from 'lodash';
 import { BehaviorSubject, ReplaySubject, Observable } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 import { NavLinkWrapper, ChromeNavLinkUpdateableFields, ChromeNavLink } from './nav_link';
-import { ApplicationStart } from '../../application';
+import { InternalApplicationStart } from '../../application';
 import { HttpStart } from '../../http';
 
 interface StartDeps {
-  application: ApplicationStart;
+  application: InternalApplicationStart;
   http: HttpStart;
 }
 
@@ -99,10 +99,22 @@ export class NavLinksService {
   private readonly stop$ = new ReplaySubject(1);
 
   public start({ application, http }: StartDeps): ChromeNavLinks {
-    const legacyAppLinks = application.availableLegacyApps.map(
-      app =>
+    const appLinks = [...application.availableApps.entries()].map(
+      ([appId, app]) =>
         [
-          app.id,
+          appId,
+          new NavLinkWrapper({
+            ...app,
+            legacy: false,
+            baseUrl: relativeToAbsolute(http.basePath.prepend(`/app/${appId}`)),
+          }),
+        ] as [string, NavLinkWrapper]
+    );
+
+    const legacyAppLinks = [...application.availableLegacyApps.entries()].map(
+      ([appId, app]) =>
+        [
+          appId,
           new NavLinkWrapper({
             ...app,
             legacy: true,
@@ -112,7 +124,7 @@ export class NavLinksService {
     );
 
     const navLinks$ = new BehaviorSubject<ReadonlyMap<string, NavLinkWrapper>>(
-      new Map(legacyAppLinks)
+      new Map([...legacyAppLinks, ...appLinks])
     );
     const forceAppSwitcherNavigation$ = new BehaviorSubject(false);
 
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 04c1a11824870a..79387aa80c1d6a 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -152,6 +152,7 @@ interface Props {
   appTitle$: Rx.Observable<string>;
   badge$: Rx.Observable<ChromeBadge | undefined>;
   breadcrumbs$: Rx.Observable<ChromeBreadcrumb[]>;
+  currentAppId$: Rx.Observable<string | undefined>;
   homeHref: string;
   isVisible$: Rx.Observable<boolean>;
   kibanaDocLink: string;
@@ -159,14 +160,17 @@ interface Props {
   recentlyAccessed$: Rx.Observable<ChromeRecentlyAccessedHistoryItem[]>;
   forceAppSwitcherNavigation$: Rx.Observable<boolean>;
   helpExtension$: Rx.Observable<ChromeHelpExtension>;
+  legacyMode: boolean;
   navControlsLeft$: Rx.Observable<readonly ChromeNavControl[]>;
   navControlsRight$: Rx.Observable<readonly ChromeNavControl[]>;
+  navigateToApp: (appId: string) => void;
   intl: InjectedIntl;
   basePath: HttpStart['basePath'];
 }
 
 interface State {
   appTitle: string;
+  currentAppId?: string;
   isVisible: boolean;
   navLinks: ReadonlyArray<ReturnType<typeof extendNavLink>>;
   recentlyAccessed: ReadonlyArray<ReturnType<typeof extendRecentlyAccessedHistoryItem>>;
@@ -201,7 +205,11 @@ class HeaderUI extends Component<Props, State> {
       this.props.navLinks$,
       this.props.recentlyAccessed$,
       // Types for combineLatest only handle up to 6 inferred types so we combine these two separately.
-      Rx.combineLatest(this.props.navControlsLeft$, this.props.navControlsRight$)
+      Rx.combineLatest(
+        this.props.navControlsLeft$,
+        this.props.navControlsRight$,
+        this.props.currentAppId$
+      )
     ).subscribe({
       next: ([
         appTitle,
@@ -209,7 +217,7 @@ class HeaderUI extends Component<Props, State> {
         forceNavigation,
         navLinks,
         recentlyAccessed,
-        [navControlsLeft, navControlsRight],
+        [navControlsLeft, navControlsRight, currentAppId],
       ]) => {
         this.setState({
           appTitle,
@@ -221,6 +229,7 @@ class HeaderUI extends Component<Props, State> {
           ),
           navControlsLeft,
           navControlsRight,
+          currentAppId,
         });
       },
     });
@@ -268,9 +277,12 @@ class HeaderUI extends Component<Props, State> {
       intl,
       kibanaDocLink,
       kibanaVersion,
+      legacyMode,
+      navigateToApp,
     } = this.props;
     const {
       appTitle,
+      currentAppId,
       isVisible,
       navControlsLeft,
       navControlsRight,
@@ -287,9 +299,18 @@ class HeaderUI extends Component<Props, State> {
       .map(navLink => ({
         key: navLink.id,
         label: navLink.title,
-        href: navLink.href,
+
+        // Legacy apps use href, NP apps use onClick
+        // This needs to work with both href and onClick to support "open in new tab" correctly, however EUI
+        // does not current support this.
+        // https://github.com/elastic/eui/pull/1933
+        href: legacyMode || navLink.legacy ? navLink.href : undefined,
+        onClick: !legacyMode && !navLink.legacy ? () => navigateToApp(navLink.id) : undefined,
+
+        // Legacy apps use `active` property, NP apps should match the current app
+        isActive: navLink.active || currentAppId === navLink.id,
         isDisabled: navLink.disabled,
-        isActive: navLink.active,
+
         iconType: navLink.euiIconType,
         icon:
           !navLink.euiIconType && navLink.icon ? (
diff --git a/src/core/public/core_system.test.ts b/src/core/public/core_system.test.ts
index 7310a8f33eba4e..895fc785b11b1c 100644
--- a/src/core/public/core_system.test.ts
+++ b/src/core/public/core_system.test.ts
@@ -272,7 +272,9 @@ describe('#start()', () => {
     await startCore();
     expect(MockRenderingService.start).toHaveBeenCalledTimes(1);
     expect(MockRenderingService.start).toHaveBeenCalledWith({
+      application: expect.any(Object),
       chrome: expect.any(Object),
+      injectedMetadata: expect.any(Object),
       targetDomElement: expect.any(HTMLElement),
     });
   });
@@ -364,7 +366,7 @@ describe('LegacyPlatformService targetDomElement', () => {
   it('only mounts the element when start, after setting up the legacyPlatformService', async () => {
     const core = createCoreSystem();
 
-    let targetDomElementInStart: HTMLElement | null;
+    let targetDomElementInStart: HTMLElement | undefined;
     MockLegacyPlatformService.start.mockImplementation(({ targetDomElement }) => {
       targetDomElementInStart = targetDomElement;
     });
diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
index 7782c93c7bbb1b..20621a927d6782 100644
--- a/src/core/public/core_system.ts
+++ b/src/core/public/core_system.ts
@@ -32,7 +32,7 @@ import { OverlayService } from './overlays';
 import { PluginsService } from './plugins';
 import { UiSettingsService } from './ui_settings';
 import { ApplicationService } from './application';
-import { mapToObject } from '../utils/';
+import { mapToObject, pick } from '../utils/';
 import { DocLinksService } from './doc_links';
 import { RenderingService } from './rendering';
 import { SavedObjectsService } from './saved_objects/saved_objects_service';
@@ -77,6 +77,7 @@ export class CoreSystem {
   private readonly context: ContextService;
 
   private readonly rootDomElement: HTMLElement;
+  private readonly coreContext: CoreContext;
   private fatalErrorsSetup: FatalErrorsSetup | null = null;
 
   constructor(params: Params) {
@@ -106,14 +107,14 @@ export class CoreSystem {
     this.savedObjects = new SavedObjectsService();
     this.uiSettings = new UiSettingsService();
     this.overlay = new OverlayService();
-    this.application = new ApplicationService();
     this.chrome = new ChromeService({ browserSupportsCsp });
     this.docLinks = new DocLinksService();
     this.rendering = new RenderingService();
+    this.application = new ApplicationService();
 
-    const core: CoreContext = { coreId: Symbol('core') };
-    this.context = new ContextService(core);
-    this.plugins = new PluginsService(core, injectedMetadata.uiPlugins);
+    this.coreContext = { coreId: Symbol('core') };
+    this.context = new ContextService(this.coreContext);
+    this.plugins = new PluginsService(this.coreContext, injectedMetadata.uiPlugins);
 
     this.legacyPlatform = new LegacyPlatformService({
       requireLegacyFiles,
@@ -133,10 +134,10 @@ export class CoreSystem {
       const http = this.http.setup({ injectedMetadata, fatalErrors: this.fatalErrorsSetup });
       const uiSettings = this.uiSettings.setup({ http, injectedMetadata });
       const notifications = this.notifications.setup({ uiSettings });
-      const application = this.application.setup();
 
       const pluginDependencies = this.plugins.getOpaqueIds();
       const context = this.context.setup({ pluginDependencies });
+      const application = this.application.setup({ context });
 
       const core: InternalCoreSetup = {
         application,
@@ -150,7 +151,11 @@ export class CoreSystem {
 
       // Services that do not expose contracts at setup
       const plugins = await this.plugins.setup(core);
-      await this.legacyPlatform.setup({ core, plugins: mapToObject(plugins.contracts) });
+
+      await this.legacyPlatform.setup({
+        core,
+        plugins: mapToObject(plugins.contracts),
+      });
 
       return { fatalErrors: this.fatalErrorsSetup };
     } catch (error) {
@@ -171,7 +176,7 @@ export class CoreSystem {
       const http = await this.http.start({ injectedMetadata, fatalErrors: this.fatalErrorsSetup });
       const savedObjects = await this.savedObjects.start({ http });
       const i18n = await this.i18n.start();
-      const application = await this.application.start({ injectedMetadata });
+      const application = await this.application.start({ http, injectedMetadata });
 
       const coreUiTargetDomElement = document.createElement('div');
       coreUiTargetDomElement.id = 'kibana-body';
@@ -200,6 +205,17 @@ export class CoreSystem {
       });
       const uiSettings = await this.uiSettings.start();
 
+      application.registerMountContext(this.coreContext.coreId, 'core', () => ({
+        application: pick(application, ['capabilities', 'navigateToApp']),
+        chrome,
+        docLinks,
+        http,
+        i18n,
+        notifications,
+        overlays,
+        uiSettings,
+      }));
+
       const core: InternalCoreStart = {
         application,
         chrome,
@@ -215,9 +231,12 @@ export class CoreSystem {
 
       const plugins = await this.plugins.start(core);
       const rendering = this.rendering.start({
+        application,
         chrome,
+        injectedMetadata,
         targetDomElement: coreUiTargetDomElement,
       });
+
       await this.legacyPlatform.start({
         core,
         plugins: mapToObject(plugins.contracts),
diff --git a/src/core/public/http/http_service.mock.ts b/src/core/public/http/http_service.mock.ts
index 4ce84f8ab38d13..628e84267ccb40 100644
--- a/src/core/public/http/http_service.mock.ts
+++ b/src/core/public/http/http_service.mock.ts
@@ -25,7 +25,7 @@ type ServiceSetupMockType = jest.Mocked<HttpSetup> & {
   basePath: jest.Mocked<HttpSetup['basePath']>;
 };
 
-const createServiceMock = (): ServiceSetupMockType => ({
+const createServiceMock = (basePath = ''): ServiceSetupMockType => ({
   fetch: jest.fn(),
   get: jest.fn(),
   head: jest.fn(),
@@ -35,8 +35,8 @@ const createServiceMock = (): ServiceSetupMockType => ({
   delete: jest.fn(),
   options: jest.fn(),
   basePath: {
-    get: jest.fn(),
-    prepend: jest.fn(),
+    get: jest.fn(() => basePath),
+    prepend: jest.fn(path => `${basePath}${path}`),
     remove: jest.fn(),
   },
   addLoadingCount: jest.fn(),
@@ -46,22 +46,19 @@ const createServiceMock = (): ServiceSetupMockType => ({
   removeAllInterceptors: jest.fn(),
 });
 
-const createSetupContractMock = createServiceMock;
-const createStartContractMock = createServiceMock;
-
-const createMock = () => {
+const createMock = (basePath = '') => {
   const mocked: jest.Mocked<Required<HttpService>> = {
     setup: jest.fn(),
     start: jest.fn(),
     stop: jest.fn(),
   };
-  mocked.setup.mockReturnValue(createSetupContractMock());
-  mocked.start.mockReturnValue(createSetupContractMock());
+  mocked.setup.mockReturnValue(createServiceMock(basePath));
+  mocked.start.mockReturnValue(createServiceMock(basePath));
   return mocked;
 };
 
 export const httpServiceMock = {
   create: createMock,
-  createSetupContract: createSetupContractMock,
-  createStartContract: createStartContractMock,
+  createSetupContract: createServiceMock,
+  createStartContract: createServiceMock,
 };
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index abc922ff97c1d5..e62f9795722403 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -68,9 +68,12 @@ import { ApplicationSetup, Capabilities, ApplicationStart } from './application'
 import { DocLinksStart } from './doc_links';
 import { SavedObjectsStart } from './saved_objects';
 import { IContextContainer, IContextProvider, ContextSetup, IContextHandler } from './context';
+import { InternalApplicationSetup, InternalApplicationStart } from './application/types';
 
 export { CoreContext, CoreSystem } from './core_system';
 export { RecursiveReadonly } from '../utils';
+
+export { App, AppBase, AppUnmount, AppMountContext, AppMountParameters } from './application';
 export {
   SavedObjectsBatchResponse,
   SavedObjectsBulkCreateObject,
@@ -114,6 +117,8 @@ export {
  * https://github.com/Microsoft/web-build-tools/issues/1237
  */
 export interface CoreSetup {
+  /** {@link ApplicationSetup} */
+  application: ApplicationSetup;
   /** {@link ContextSetup} */
   context: ContextSetup;
   /** {@link FatalErrorsSetup} */
@@ -137,7 +142,7 @@ export interface CoreSetup {
  */
 export interface CoreStart {
   /** {@link ApplicationStart} */
-  application: Pick<ApplicationStart, 'capabilities'>;
+  application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'registerMountContext'>;
   /** {@link ChromeStart} */
   chrome: ChromeStart;
   /** {@link DocLinksStart} */
@@ -157,14 +162,14 @@ export interface CoreStart {
 }
 
 /** @internal */
-export interface InternalCoreSetup extends CoreSetup {
-  application: ApplicationSetup;
+export interface InternalCoreSetup extends Omit<CoreSetup, 'application'> {
+  application: InternalApplicationSetup;
   injectedMetadata: InjectedMetadataSetup;
 }
 
 /** @internal */
-export interface InternalCoreStart extends CoreStart {
-  application: ApplicationStart;
+export interface InternalCoreStart extends Omit<CoreStart, 'application'> {
+  application: InternalApplicationStart;
   injectedMetadata: InjectedMetadataStart;
 }
 
diff --git a/src/core/public/injected_metadata/injected_metadata_service.mock.ts b/src/core/public/injected_metadata/injected_metadata_service.mock.ts
index c4579bee3f1310..9e1d5aeec7ff49 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.mock.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.mock.ts
@@ -25,6 +25,7 @@ const createSetupContractMock = () => {
     getKibanaBranch: jest.fn(),
     getCapabilities: jest.fn(),
     getCspConfig: jest.fn(),
+    getLegacyMode: jest.fn(),
     getLegacyMetadata: jest.fn(),
     getPlugins: jest.fn(),
     getInjectedVar: jest.fn(),
@@ -34,6 +35,7 @@ const createSetupContractMock = () => {
   setupContract.getCapabilities.mockReturnValue({} as any);
   setupContract.getCspConfig.mockReturnValue({ warnLegacyBrowsers: true });
   setupContract.getKibanaVersion.mockReturnValue('kibanaVersion');
+  setupContract.getLegacyMode.mockReturnValue(true);
   setupContract.getLegacyMetadata.mockReturnValue({
     nav: [],
     uiSettings: {
diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts
index 9fbc9554855126..fa93d0f5288b4f 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.ts
@@ -51,6 +51,7 @@ export interface InjectedMetadataParams {
       plugin: DiscoveredPlugin;
     }>;
     capabilities: Capabilities;
+    legacyMode: boolean;
     legacyMetadata: {
       app: unknown;
       translations: unknown;
@@ -112,6 +113,10 @@ export class InjectedMetadataService {
         return this.state.uiPlugins;
       },
 
+      getLegacyMode: () => {
+        return this.state.legacyMode;
+      },
+
       getLegacyMetadata: () => {
         return this.state.legacyMetadata;
       },
@@ -156,6 +161,8 @@ export interface InjectedMetadataSetup {
     id: string;
     plugin: DiscoveredPlugin;
   }>;
+  /** Indicates whether or not we are rendering a known legacy app. */
+  getLegacyMode: () => boolean;
   getLegacyMetadata: () => {
     app: unknown;
     translations: unknown;
diff --git a/src/core/public/legacy/legacy_service.test.ts b/src/core/public/legacy/legacy_service.test.ts
index eb5b3e90f1a525..060ab6f62ad07d 100644
--- a/src/core/public/legacy/legacy_service.test.ts
+++ b/src/core/public/legacy/legacy_service.test.ts
@@ -98,6 +98,7 @@ const notificationsStart = notificationServiceMock.createStartContract();
 const overlayStart = overlayServiceMock.createStartContract();
 const uiSettingsStart = uiSettingsServiceMock.createStartContract();
 const savedObjectsStart = savedObjectsMock.createStartContract();
+const mockStorage = { getItem: jest.fn() } as any;
 
 const defaultStartDeps = {
   core: {
@@ -112,6 +113,7 @@ const defaultStartDeps = {
     uiSettings: uiSettingsStart,
     savedObjects: savedObjectsStart,
   },
+  lastSubUrlStorage: mockStorage,
   targetDomElement: document.createElement('div'),
   plugins: {},
 };
@@ -138,6 +140,23 @@ describe('#setup()', () => {
 });
 
 describe('#start()', () => {
+  it('fetches and sets legacy lastSubUrls', () => {
+    chromeStart.navLinks.getAll.mockReturnValue([
+      { id: 'link1', baseUrl: 'http://wowza.com/app1', legacy: true } as any,
+    ]);
+    mockStorage.getItem.mockReturnValue('http://wowza.com/app1/subUrl');
+    const legacyPlatform = new LegacyPlatformService({
+      ...defaultParams,
+    });
+
+    legacyPlatform.setup(defaultSetupDeps);
+    legacyPlatform.start({ ...defaultStartDeps, lastSubUrlStorage: mockStorage });
+
+    expect(chromeStart.navLinks.update).toHaveBeenCalledWith('link1', {
+      url: 'http://wowza.com/app1/subUrl',
+    });
+  });
+
   it('initializes ui/new_platform with core APIs', () => {
     const legacyPlatform = new LegacyPlatformService({
       ...defaultParams,
diff --git a/src/core/public/legacy/legacy_service.ts b/src/core/public/legacy/legacy_service.ts
index 7d852773ad03fa..73f4682debe50e 100644
--- a/src/core/public/legacy/legacy_service.ts
+++ b/src/core/public/legacy/legacy_service.ts
@@ -34,7 +34,8 @@ interface SetupDeps {
 interface StartDeps {
   core: InternalCoreStart;
   plugins: Record<string, unknown>;
-  targetDomElement: HTMLElement;
+  lastSubUrlStorage?: Storage;
+  targetDomElement?: HTMLElement;
 }
 
 interface BootstrapModule {
@@ -55,10 +56,7 @@ export class LegacyPlatformService {
   constructor(private readonly params: LegacyPlatformParams) {}
 
   public setup({ core, plugins }: SetupDeps) {
-    // Inject parts of the new platform into parts of the legacy platform
-    // so that legacy APIs/modules can mimic their new platform counterparts
-    require('ui/new_platform').__setup__(core, plugins);
-
+    // Always register legacy apps, even if not in legacy mode.
     core.injectedMetadata.getLegacyMetadata().nav.forEach((navLink: any) =>
       core.application.registerLegacyApp({
         id: navLink.id,
@@ -71,9 +69,36 @@ export class LegacyPlatformService {
         linkToLastSubUrl: navLink.linkToLastSubUrl,
       })
     );
+
+    // Inject parts of the new platform into parts of the legacy platform
+    // so that legacy APIs/modules can mimic their new platform counterparts
+    if (core.injectedMetadata.getLegacyMode()) {
+      require('ui/new_platform').__setup__(core, plugins);
+    }
   }
 
-  public start({ core, targetDomElement, plugins }: StartDeps) {
+  public start({
+    core,
+    targetDomElement,
+    plugins,
+    lastSubUrlStorage = window.sessionStorage,
+  }: StartDeps) {
+    // Initialize legacy sub urls
+    core.chrome.navLinks
+      .getAll()
+      .filter(link => link.legacy)
+      .forEach(navLink => {
+        const lastSubUrl = lastSubUrlStorage.getItem(`lastSubUrl:${navLink.baseUrl}`);
+        core.chrome.navLinks.update(navLink.id, {
+          url: lastSubUrl || navLink.url || navLink.baseUrl,
+        });
+      });
+
+    // Only import and bootstrap legacy platform if we're in legacy mode.
+    if (!core.injectedMetadata.getLegacyMode()) {
+      return;
+    }
+
     // Inject parts of the new platform into parts of the legacy platform
     // so that legacy APIs/modules can mimic their new platform counterparts
     require('ui/new_platform').__start__(core, plugins);
@@ -91,7 +116,8 @@ export class LegacyPlatformService {
 
     this.targetDomElement = targetDomElement;
 
-    this.bootstrapModule.bootstrap(this.targetDomElement);
+    // `targetDomElement` is always defined when in legacy mode
+    this.bootstrapModule.bootstrap(this.targetDomElement!);
   }
 
   public stop() {
diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts
index 0f3a01c793ae3e..7c99f69d6fd7ad 100644
--- a/src/core/public/mocks.ts
+++ b/src/core/public/mocks.ts
@@ -42,6 +42,7 @@ export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 
 function createCoreSetupMock() {
   const mock: MockedKeys<CoreSetup> = {
+    application: applicationServiceMock.createSetupContract(),
     context: contextServiceMock.createSetupContract(),
     fatalErrors: fatalErrorsServiceMock.createSetupContract(),
     http: httpServiceMock.createSetupContract(),
diff --git a/src/core/public/plugins/plugin_context.ts b/src/core/public/plugins/plugin_context.ts
index 66cb7c4a1171e3..fc39537513b6c3 100644
--- a/src/core/public/plugins/plugin_context.ts
+++ b/src/core/public/plugins/plugin_context.ts
@@ -76,6 +76,11 @@ export function createPluginSetupContext<
   plugin: PluginWrapper<TSetup, TStart, TPluginsSetup, TPluginsStart>
 ): CoreSetup {
   return {
+    application: {
+      register: app => deps.application.register(plugin.opaqueId, app),
+      registerMountContext: (contextName, provider) =>
+        deps.application.registerMountContext(plugin.opaqueId, contextName, provider),
+    },
     context: omit(deps.context, 'setCurrentPlugin'),
     fatalErrors: deps.fatalErrors,
     http: deps.http,
@@ -107,6 +112,9 @@ export function createPluginStartContext<
   return {
     application: {
       capabilities: deps.application.capabilities,
+      navigateToApp: deps.application.navigateToApp,
+      registerMountContext: (contextName, provider) =>
+        deps.application.registerMountContext(plugin.opaqueId, contextName, provider),
     },
     docLinks: deps.docLinks,
     http: deps.http,
diff --git a/src/core/public/plugins/plugins_service.test.ts b/src/core/public/plugins/plugins_service.test.ts
index 2b689e45b4f1ad..d6411554e5f85b 100644
--- a/src/core/public/plugins/plugins_service.test.ts
+++ b/src/core/public/plugins/plugins_service.test.ts
@@ -72,7 +72,7 @@ beforeEach(() => {
     },
   ];
   mockSetupDeps = {
-    application: applicationServiceMock.createSetupContract(),
+    application: applicationServiceMock.createInternalSetupContract(),
     context: contextServiceMock.createSetupContract(),
     fatalErrors: fatalErrorsServiceMock.createSetupContract(),
     http: httpServiceMock.createSetupContract(),
@@ -81,10 +81,11 @@ beforeEach(() => {
     uiSettings: uiSettingsServiceMock.createSetupContract(),
   };
   mockSetupContext = {
-    ...omit(mockSetupDeps, 'application', 'injectedMetadata'),
+    ...omit(mockSetupDeps, 'injectedMetadata'),
+    application: expect.any(Object),
   };
   mockStartDeps = {
-    application: applicationServiceMock.createStartContract(),
+    application: applicationServiceMock.createInternalStartContract(),
     docLinks: docLinksServiceMock.createStartContract(),
     http: httpServiceMock.createStartContract(),
     chrome: chromeServiceMock.createStartContract(),
@@ -97,9 +98,7 @@ beforeEach(() => {
   };
   mockStartContext = {
     ...omit(mockStartDeps, 'injectedMetadata'),
-    application: {
-      capabilities: mockStartDeps.application.capabilities,
-    },
+    application: expect.any(Object),
     chrome: omit(mockStartDeps.chrome, 'getComponent'),
   };
 
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index a5c31e41e02672..b9541b576c04c0 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -8,26 +8,65 @@ import { IconType } from '@elastic/eui';
 import { Observable } from 'rxjs';
 import React from 'react';
 import * as Rx from 'rxjs';
+import { Subject } from 'rxjs';
 import { EuiGlobalToastListToast as Toast } from '@elastic/eui';
 
+// @public
+export interface App extends AppBase {
+    mount: (context: AppMountContext, params: AppMountParameters) => AppUnmount | Promise<AppUnmount>;
+}
+
+// @public (undocumented)
+export interface AppBase {
+    capabilities?: Partial<Capabilities>;
+    euiIconType?: string;
+    icon?: string;
+    // (undocumented)
+    id: string;
+    order?: number;
+    title: string;
+    tooltip$?: Observable<string>;
+}
+
 // @public (undocumented)
 export interface ApplicationSetup {
-    // Warning: (ae-forgotten-export) The symbol "App" needs to be exported by the entry point index.d.ts
-    registerApp(app: App): void;
-    // Warning: (ae-forgotten-export) The symbol "LegacyApp" needs to be exported by the entry point index.d.ts
-    // 
-    // @internal
-    registerLegacyApp(app: LegacyApp): void;
+    register(app: App): void;
+    registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, keyof AppMountContext>): void;
 }
 
 // @public (undocumented)
 export interface ApplicationStart {
-    availableApps: readonly App[];
-    // @internal
-    availableLegacyApps: readonly LegacyApp[];
     capabilities: RecursiveReadonly<Capabilities>;
+    navigateToApp(appId: string, options?: {
+        path?: string;
+        state?: any;
+    }): void;
+    registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 }
 
+// @public
+export interface AppMountContext {
+    core: {
+        application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp'>;
+        chrome: ChromeStart;
+        docLinks: DocLinksStart;
+        http: HttpStart;
+        i18n: I18nStart;
+        notifications: NotificationsStart;
+        overlays: OverlayStart;
+        uiSettings: UiSettingsClientContract;
+    };
+}
+
+// @public (undocumented)
+export interface AppMountParameters {
+    appBasePath: string;
+    element: HTMLElement;
+}
+
+// @public
+export type AppUnmount = () => void;
+
 // @public
 export interface Capabilities {
     [key: string]: Record<string, boolean | Record<string, boolean>>;
@@ -102,7 +141,7 @@ export interface ChromeNavLink {
     readonly legacy: boolean;
     // @deprecated
     readonly linkToLastSubUrl?: boolean;
-    readonly order: number;
+    readonly order?: number;
     // @deprecated
     readonly subUrlBase?: string;
     readonly title: string;
@@ -182,6 +221,8 @@ export interface CoreContext {
 
 // @public
 export interface CoreSetup {
+    // (undocumented)
+    application: ApplicationSetup;
     // (undocumented)
     context: ContextSetup;
     // (undocumented)
@@ -197,7 +238,7 @@ export interface CoreSetup {
 // @public
 export interface CoreStart {
     // (undocumented)
-    application: Pick<ApplicationStart, 'capabilities'>;
+    application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'registerMountContext'>;
     // (undocumented)
     chrome: ChromeStart;
     // (undocumented)
@@ -503,9 +544,11 @@ export type IContextHandler<TContext extends {}, TReturn, THandlerParameters ext
 export type IContextProvider<TContext extends Record<string, any>, TContextName extends keyof TContext, TProviderParameters extends any[] = []> = (context: Partial<TContext>, ...rest: TProviderParameters) => Promise<TContext[TContextName]> | TContext[TContextName];
 
 // @internal (undocumented)
-export interface InternalCoreSetup extends CoreSetup {
+export interface InternalCoreSetup extends Omit<CoreSetup, 'application'> {
+    // Warning: (ae-forgotten-export) The symbol "InternalApplicationSetup" needs to be exported by the entry point index.d.ts
+    // 
     // (undocumented)
-    application: ApplicationSetup;
+    application: InternalApplicationSetup;
     // Warning: (ae-forgotten-export) The symbol "InjectedMetadataSetup" needs to be exported by the entry point index.d.ts
     // 
     // (undocumented)
@@ -513,9 +556,11 @@ export interface InternalCoreSetup extends CoreSetup {
 }
 
 // @internal (undocumented)
-export interface InternalCoreStart extends CoreStart {
+export interface InternalCoreStart extends Omit<CoreStart, 'application'> {
+    // Warning: (ae-forgotten-export) The symbol "InternalApplicationStart" needs to be exported by the entry point index.d.ts
+    // 
     // (undocumented)
-    application: ApplicationStart;
+    application: InternalApplicationStart;
     // Warning: (ae-forgotten-export) The symbol "InjectedMetadataStart" needs to be exported by the entry point index.d.ts
     // 
     // (undocumented)
diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx
index 5b4ab939966577..f74014abf13532 100644
--- a/src/core/public/rendering/rendering_service.test.tsx
+++ b/src/core/public/rendering/rendering_service.test.tsx
@@ -21,14 +21,20 @@ import React from 'react';
 
 import { chromeServiceMock } from '../chrome/chrome_service.mock';
 import { RenderingService } from './rendering_service';
+import { InternalApplicationStart } from '../application';
+import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
 
 describe('RenderingService#start', () => {
   const getService = () => {
     const rendering = new RenderingService();
+    const application = {
+      getComponent: () => <div>Hello application!</div>,
+    } as InternalApplicationStart;
     const chrome = chromeServiceMock.createStartContract();
     chrome.getComponent.mockReturnValue(<div>Hello chrome!</div>);
+    const injectedMetadata = injectedMetadataServiceMock.createStartContract();
     const targetDomElement = document.createElement('div');
-    const start = rendering.start({ chrome, targetDomElement });
+    const start = rendering.start({ application, chrome, injectedMetadata, targetDomElement });
     return { start, targetDomElement };
   };
 
@@ -54,7 +60,7 @@ describe('RenderingService#start', () => {
       start: { legacyTargetDomElement },
       targetDomElement,
     } = getService();
-    legacyTargetDomElement.innerHTML = '<span id="legacy">Hello legacy!</span>';
+    legacyTargetDomElement!.innerHTML = '<span id="legacy">Hello legacy!</span>';
     expect(targetDomElement.querySelector('#legacy')).toMatchInlineSnapshot(`
 <span
   id="legacy"
diff --git a/src/core/public/rendering/rendering_service.tsx b/src/core/public/rendering/rendering_service.tsx
index cbb931bf59ef90..23a96dc056846f 100644
--- a/src/core/public/rendering/rendering_service.tsx
+++ b/src/core/public/rendering/rendering_service.tsx
@@ -22,9 +22,13 @@ import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
 
 import { InternalChromeStart } from '../chrome';
+import { InternalApplicationStart } from '../application';
+import { InjectedMetadataStart } from '../injected_metadata';
 
 interface StartDeps {
+  application: InternalApplicationStart;
   chrome: InternalChromeStart;
+  injectedMetadata: InjectedMetadataStart;
   targetDomElement: HTMLDivElement;
 }
 
@@ -39,28 +43,40 @@ interface StartDeps {
  * @internal
  */
 export class RenderingService {
-  start({ chrome, targetDomElement }: StartDeps) {
+  start({ application, chrome, injectedMetadata, targetDomElement }: StartDeps): RenderingStart {
     const chromeUi = chrome.getComponent();
-    const legacyRef = React.createRef<HTMLDivElement>();
+    const appUi = application.getComponent();
+
+    const legacyMode = injectedMetadata.getLegacyMode();
+    const legacyRef = legacyMode ? React.createRef<HTMLDivElement>() : null;
 
     ReactDOM.render(
       <I18nProvider>
         <div className="content" data-test-subj="kibanaChrome">
           {chromeUi}
 
-          <div ref={legacyRef} />
+          {!legacyMode && (
+            <div className="app-wrapper">
+              <div className="app-wrapper-panel">
+                <div className="application">{appUi}</div>
+              </div>
+            </div>
+          )}
+
+          {legacyMode && <div ref={legacyRef} />}
         </div>
       </I18nProvider>,
       targetDomElement
     );
 
     return {
-      legacyTargetDomElement: legacyRef.current!,
+      // When in legacy mode, return legacy div, otherwise undefined.
+      legacyTargetDomElement: legacyRef ? legacyRef.current! : undefined,
     };
   }
 }
 
 /** @internal */
 export interface RenderingStart {
-  legacyTargetDomElement: HTMLDivElement;
+  legacyTargetDomElement?: HTMLDivElement;
 }
diff --git a/src/core/utils/context.mock.ts b/src/core/utils/context.mock.ts
index d59d0066c4e6ee..4d91c11542b2f8 100644
--- a/src/core/utils/context.mock.ts
+++ b/src/core/utils/context.mock.ts
@@ -24,7 +24,9 @@ export type ContextContainerMock = jest.Mocked<IContextContainer<any, any, any>>
 const createContextMock = () => {
   const contextMock: ContextContainerMock = {
     registerContext: jest.fn(),
-    createHandler: jest.fn(),
+    createHandler: jest.fn((id, handler) => (...args: any[]) =>
+      Promise.resolve(handler({}, ...args))
+    ),
   };
   contextMock.createHandler.mockImplementation((pluginId, handler) => (...args) =>
     handler({}, ...args)
diff --git a/src/core/utils/pick.ts b/src/core/utils/pick.ts
index d55c76a3ca77d6..77854f9af680b4 100644
--- a/src/core/utils/pick.ts
+++ b/src/core/utils/pick.ts
@@ -17,10 +17,7 @@
  * under the License.
  */
 
-export function pick<T extends Record<string, unknown>, K extends keyof T>(
-  obj: T,
-  keys: K[]
-): Pick<T, K> {
+export function pick<T extends object, K extends keyof T>(obj: T, keys: K[]): Pick<T, K> {
   return keys.reduce(
     (acc, key) => {
       if (obj.hasOwnProperty(key)) {
diff --git a/src/legacy/core_plugins/tests_bundle/tests_entry_template.js b/src/legacy/core_plugins/tests_bundle/tests_entry_template.js
index 53b627d39595e4..5f2abd8c9e0832 100644
--- a/src/legacy/core_plugins/tests_bundle/tests_entry_template.js
+++ b/src/legacy/core_plugins/tests_bundle/tests_entry_template.js
@@ -85,6 +85,7 @@ const coreSystem = new CoreSystem({
   injectedMetadata: {
     version: '1.2.3',
     buildNumber: 1234,
+    legacyMode: true,
     legacyMetadata: {
       nav: [],
       version: '1.2.3',
diff --git a/src/legacy/ui/public/chrome/chrome.js b/src/legacy/ui/public/chrome/chrome.js
index 8f58da9107673f..a5a0521013a6e1 100644
--- a/src/legacy/ui/public/chrome/chrome.js
+++ b/src/legacy/ui/public/chrome/chrome.js
@@ -95,7 +95,6 @@ const waitForBootstrap = new Promise(resolve => {
     document.body.setAttribute('id', `${internals.app.id}-app`);
 
     chrome.setupAngular();
-    // targetDomElement.setAttribute('id', 'kibana-body');
     targetDomElement.setAttribute('kbn-chrome', 'true');
     targetDomElement.setAttribute('ng-class', '{ \'hidden-chrome\': !chrome.getVisible() }');
     targetDomElement.className = 'app-wrapper';
diff --git a/src/legacy/ui/public/chrome/directives/kbn_chrome.js b/src/legacy/ui/public/chrome/directives/kbn_chrome.js
index d81a1ceb5f288e..755cb8b42d3637 100644
--- a/src/legacy/ui/public/chrome/directives/kbn_chrome.js
+++ b/src/legacy/ui/public/chrome/directives/kbn_chrome.js
@@ -77,15 +77,21 @@ export function kbnChromeProvider(chrome, internals) {
           // Non-scope based code (e.g., React)
 
           // Banners
-          ReactDOM.render(
-            <I18nContext>
-              <GlobalBannerList
-                banners={banners.list}
-                subscribe={banners.onChange}
-              />
-            </I18nContext>,
-            document.getElementById('globalBannerList')
-          );
+          const bannerListContainer = document.getElementById('globalBannerList');
+          // Banners not supported in New Platform yet
+          // https://github.com/elastic/kibana/issues/41986
+          if (bannerListContainer) {
+            ReactDOM.render(
+              <I18nContext>
+                <GlobalBannerList
+                  banners={banners.list}
+                  subscribe={banners.onChange}
+                />
+              </I18nContext>,
+              bannerListContainer
+            );
+          }
+
 
           return chrome;
         }
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index 998bcbc8f4f179..1e91c4ca2c9049 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -164,7 +164,7 @@ export function uiRenderMixin(kbnServer, server, config) {
   });
 
   server.route({
-    path: '/app/{id}',
+    path: '/app/{id}/{path?}',
     method: 'GET',
     async handler(req, h) {
       const id = req.params.id;
@@ -239,6 +239,7 @@ export function uiRenderMixin(kbnServer, server, config) {
         buildNumber: config.get('pkg.buildNum'),
         branch: config.get('pkg.branch'),
         basePath,
+        legacyMode: app.getId() !== 'core',
         i18n: {
           translationsUrl: `${basePath}/translations/${i18n.getLocale()}.json`,
         },
diff --git a/yarn.lock b/yarn.lock
index 26ab312da1ad62..9bcbf5c8a7f38f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3417,7 +3417,7 @@
   resolved "https://registry.yarnpkg.com/@types/has-ansi/-/has-ansi-3.0.0.tgz#636403dc4e0b2649421c4158e5c404416f3f0330"
   integrity sha512-H3vFOwfLlFEC0MOOrcSkus8PCnMCzz4N0EqUbdJZCdDhBTfkAu86aRYA+MTxjKW6jCpUvxcn4715US8g+28BMA==
 
-"@types/history@*":
+"@types/history@*", "@types/history@^4.7.2":
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.2.tgz#0e670ea254d559241b6eeb3894f8754991e73220"
   integrity sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==
@@ -14435,7 +14435,7 @@ history-extra@^5.0.1:
   resolved "https://registry.yarnpkg.com/history-extra/-/history-extra-5.0.1.tgz#95a2e59dda526c4241d0ae1b124a77a5e4675ce8"
   integrity sha512-6XV1L1lHgporVWgppa/Kq+Fnz4lhBew7iMxYCTfzVmoEywsAKJnTjdw1zOd+EGLHGYp0/V8jSVMEgqx4QbHLTw==
 
-history@4.9.0:
+history@4.9.0, history@^4.9.0:
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
   integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==

From d5f769dcc8397ed781f31656a3a57c8e080f9c46 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 6 Aug 2019 13:27:03 -0500
Subject: [PATCH 03/14] Add LegacyCore{Setup,Start}

---
 ...ana-plugin-public.corestart.application.md |  2 +-
 .../public/kibana-plugin-public.corestart.md  |  2 +-
 ...public.legacycoresetup.injectedmetadata.md | 15 ++++++++
 .../kibana-plugin-public.legacycoresetup.md   | 28 +++++++++++++++
 ...public.legacycorestart.injectedmetadata.md | 15 ++++++++
 .../kibana-plugin-public.legacycorestart.md   | 28 +++++++++++++++
 .../core/public/kibana-plugin-public.md       |  2 ++
 src/core/public/core_system.ts                | 22 ++++++++++--
 src/core/public/index.ts                      | 34 ++++++++++++++-----
 src/core/public/legacy/legacy_service.test.ts |  8 ++---
 src/core/public/legacy/legacy_service.ts      | 28 +++++++++++++--
 src/core/public/plugins/plugins_service.ts    |  2 +-
 src/core/public/public.api.md                 | 23 ++++---------
 .../public/legacy_compat/angular_config.tsx   | 20 +++++------
 .../ui/public/new_platform/new_platform.ts    | 16 ++++-----
 .../components/app/Main/UpdateBreadcrumbs.tsx |  4 +--
 .../ServiceIntegrations/WatcherFlyout.tsx     |  8 ++---
 .../ServiceIntegrations/index.tsx             |  4 +--
 .../__test__/ServiceOverview.test.tsx         |  4 +--
 .../DiscoverLinks.integration.test.tsx        |  4 +--
 .../shared/Links/InfraLink.test.tsx           |  4 +--
 .../shared/Links/KibanaLink.test.tsx          |  4 +--
 .../MachineLearningLinks/MLJobLink.test.tsx   |  4 +--
 .../MachineLearningLinks/MLLink.test.tsx      |  4 +--
 .../__test__/TransactionActionMenu.test.tsx   |  4 +--
 .../apm/public/context/CoreContext.tsx        |  6 ++--
 .../apm/public/new-platform/plugin.tsx        |  4 +--
 27 files changed, 218 insertions(+), 81 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-public.legacycoresetup.injectedmetadata.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.legacycoresetup.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.legacycorestart.injectedmetadata.md
 create mode 100644 docs/development/core/public/kibana-plugin-public.legacycorestart.md

diff --git a/docs/development/core/public/kibana-plugin-public.corestart.application.md b/docs/development/core/public/kibana-plugin-public.corestart.application.md
index c3bf2953b5175d..c26701ca80529a 100644
--- a/docs/development/core/public/kibana-plugin-public.corestart.application.md
+++ b/docs/development/core/public/kibana-plugin-public.corestart.application.md
@@ -9,5 +9,5 @@
 <b>Signature:</b>
 
 ```typescript
-application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'registerMountContext'>;
+application: ApplicationStart;
 ```
diff --git a/docs/development/core/public/kibana-plugin-public.corestart.md b/docs/development/core/public/kibana-plugin-public.corestart.md
index 74b578f4511584..5c1626958c4df6 100644
--- a/docs/development/core/public/kibana-plugin-public.corestart.md
+++ b/docs/development/core/public/kibana-plugin-public.corestart.md
@@ -16,7 +16,7 @@ export interface CoreStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [application](./kibana-plugin-public.corestart.application.md) | <code>Pick&lt;ApplicationStart, 'capabilities' &#124; 'navigateToApp' &#124; 'registerMountContext'&gt;</code> | [ApplicationStart](./kibana-plugin-public.applicationstart.md) |
+|  [application](./kibana-plugin-public.corestart.application.md) | <code>ApplicationStart</code> | [ApplicationStart](./kibana-plugin-public.applicationstart.md) |
 |  [chrome](./kibana-plugin-public.corestart.chrome.md) | <code>ChromeStart</code> | [ChromeStart](./kibana-plugin-public.chromestart.md) |
 |  [docLinks](./kibana-plugin-public.corestart.doclinks.md) | <code>DocLinksStart</code> | [DocLinksStart](./kibana-plugin-public.doclinksstart.md) |
 |  [http](./kibana-plugin-public.corestart.http.md) | <code>HttpStart</code> | [HttpStart](./kibana-plugin-public.httpstart.md) |
diff --git a/docs/development/core/public/kibana-plugin-public.legacycoresetup.injectedmetadata.md b/docs/development/core/public/kibana-plugin-public.legacycoresetup.injectedmetadata.md
new file mode 100644
index 00000000000000..f71277e64ff17a
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.legacycoresetup.injectedmetadata.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [LegacyCoreSetup](./kibana-plugin-public.legacycoresetup.md) &gt; [injectedMetadata](./kibana-plugin-public.legacycoresetup.injectedmetadata.md)
+
+## LegacyCoreSetup.injectedMetadata property
+
+> Warning: This API is now obsolete.
+> 
+> 
+
+<b>Signature:</b>
+
+```typescript
+injectedMetadata: InjectedMetadataSetup;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.legacycoresetup.md b/docs/development/core/public/kibana-plugin-public.legacycoresetup.md
new file mode 100644
index 00000000000000..f704bc65d12a52
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.legacycoresetup.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [LegacyCoreSetup](./kibana-plugin-public.legacycoresetup.md)
+
+## LegacyCoreSetup interface
+
+> Warning: This API is now obsolete.
+> 
+> 
+
+Setup interface exposed to the legacy platform via the `ui/new_platform` module.
+
+<b>Signature:</b>
+
+```typescript
+export interface LegacyCoreSetup extends CoreSetup 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [injectedMetadata](./kibana-plugin-public.legacycoresetup.injectedmetadata.md) | <code>InjectedMetadataSetup</code> |  |
+
+## Remarks
+
+Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreSetup](./kibana-plugin-public.coresetup.md)<!-- -->, unsupported methods will throw exceptions when called.
+
diff --git a/docs/development/core/public/kibana-plugin-public.legacycorestart.injectedmetadata.md b/docs/development/core/public/kibana-plugin-public.legacycorestart.injectedmetadata.md
new file mode 100644
index 00000000000000..cd818c3f5adc72
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.legacycorestart.injectedmetadata.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [LegacyCoreStart](./kibana-plugin-public.legacycorestart.md) &gt; [injectedMetadata](./kibana-plugin-public.legacycorestart.injectedmetadata.md)
+
+## LegacyCoreStart.injectedMetadata property
+
+> Warning: This API is now obsolete.
+> 
+> 
+
+<b>Signature:</b>
+
+```typescript
+injectedMetadata: InjectedMetadataStart;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.legacycorestart.md b/docs/development/core/public/kibana-plugin-public.legacycorestart.md
new file mode 100644
index 00000000000000..775c3fb1ffe3d1
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.legacycorestart.md
@@ -0,0 +1,28 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [LegacyCoreStart](./kibana-plugin-public.legacycorestart.md)
+
+## LegacyCoreStart interface
+
+> Warning: This API is now obsolete.
+> 
+> 
+
+Start interface exposed to the legacy platform via the `ui/new_platform` module.
+
+<b>Signature:</b>
+
+```typescript
+export interface LegacyCoreStart extends CoreStart 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [injectedMetadata](./kibana-plugin-public.legacycorestart.injectedmetadata.md) | <code>InjectedMetadataStart</code> |  |
+
+## Remarks
+
+Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreStart](./kibana-plugin-public.corestart.md)<!-- -->, unsupported methods will throw exceptions when called.
+
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index 69c9aebbc8c825..ccabdc62c5e7a2 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -58,6 +58,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [HttpServiceBase](./kibana-plugin-public.httpservicebase.md) |  |
 |  [I18nStart](./kibana-plugin-public.i18nstart.md) | I18nStart.Context is required by any localizable React component from @<!-- -->kbn/i18n and @<!-- -->elastic/eui packages and is supposed to be used as the topmost component for any i18n-compatible React tree. |
 |  [IContextContainer](./kibana-plugin-public.icontextcontainer.md) | An object that handles registration of context providers and configuring handlers with context. |
+|  [LegacyCoreSetup](./kibana-plugin-public.legacycoresetup.md) | Setup interface exposed to the legacy platform via the <code>ui/new_platform</code> module. |
+|  [LegacyCoreStart](./kibana-plugin-public.legacycorestart.md) | Start interface exposed to the legacy platform via the <code>ui/new_platform</code> module. |
 |  [LegacyNavLink](./kibana-plugin-public.legacynavlink.md) |  |
 |  [NotificationsSetup](./kibana-plugin-public.notificationssetup.md) |  |
 |  [NotificationsStart](./kibana-plugin-public.notificationsstart.md) |  |
diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
index 20621a927d6782..4eb16572d8fec1 100644
--- a/src/core/public/core_system.ts
+++ b/src/core/public/core_system.ts
@@ -20,12 +20,17 @@
 import './core.css';
 
 import { CoreId } from '../server';
-import { InternalCoreSetup, InternalCoreStart } from '.';
+import { CoreSetup, CoreStart } from '.';
 import { ChromeService } from './chrome';
 import { FatalErrorsService, FatalErrorsSetup } from './fatal_errors';
 import { HttpService } from './http';
 import { I18nService } from './i18n';
-import { InjectedMetadataParams, InjectedMetadataService } from './injected_metadata';
+import {
+  InjectedMetadataParams,
+  InjectedMetadataService,
+  InjectedMetadataSetup,
+  InjectedMetadataStart,
+} from './injected_metadata';
 import { LegacyPlatformParams, LegacyPlatformService } from './legacy';
 import { NotificationsService } from './notifications';
 import { OverlayService } from './overlays';
@@ -37,6 +42,7 @@ import { DocLinksService } from './doc_links';
 import { RenderingService } from './rendering';
 import { SavedObjectsService } from './saved_objects/saved_objects_service';
 import { ContextService } from './context';
+import { InternalApplicationSetup, InternalApplicationStart } from './application/types';
 
 interface Params {
   rootDomElement: HTMLElement;
@@ -51,6 +57,18 @@ export interface CoreContext {
   coreId: CoreId;
 }
 
+/** @internal */
+export interface InternalCoreSetup extends Omit<CoreSetup, 'application'> {
+  application: InternalApplicationSetup;
+  injectedMetadata: InjectedMetadataSetup;
+}
+
+/** @internal */
+export interface InternalCoreStart extends Omit<CoreStart, 'application'> {
+  application: InternalApplicationStart;
+  injectedMetadata: InjectedMetadataStart;
+}
+
 /**
  * The CoreSystem is the root of the new platform, and setups all parts
  * of Kibana in the UI, including the LegacyPlatform which is managed
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index e62f9795722403..2cbb7a50442613 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -68,7 +68,6 @@ import { ApplicationSetup, Capabilities, ApplicationStart } from './application'
 import { DocLinksStart } from './doc_links';
 import { SavedObjectsStart } from './saved_objects';
 import { IContextContainer, IContextProvider, ContextSetup, IContextHandler } from './context';
-import { InternalApplicationSetup, InternalApplicationStart } from './application/types';
 
 export { CoreContext, CoreSystem } from './core_system';
 export { RecursiveReadonly } from '../utils';
@@ -142,7 +141,7 @@ export interface CoreSetup {
  */
 export interface CoreStart {
   /** {@link ApplicationStart} */
-  application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'registerMountContext'>;
+  application: ApplicationStart;
   /** {@link ChromeStart} */
   chrome: ChromeStart;
   /** {@link DocLinksStart} */
@@ -161,15 +160,34 @@ export interface CoreStart {
   uiSettings: UiSettingsClientContract;
 }
 
-/** @internal */
-export interface InternalCoreSetup extends Omit<CoreSetup, 'application'> {
-  application: InternalApplicationSetup;
+/**
+ * Setup interface exposed to the legacy platform via the `ui/new_platform` module.
+ *
+ * @remarks
+ * Some methods are not supported in the legacy platform and while present to make this type compatibile with
+ * {@link CoreSetup}, unsupported methods will throw exceptions when called.
+ *
+ * @public
+ * @deprecated
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface LegacyCoreSetup extends CoreSetup {
+  /** @deprecated */
   injectedMetadata: InjectedMetadataSetup;
 }
 
-/** @internal */
-export interface InternalCoreStart extends Omit<CoreStart, 'application'> {
-  application: InternalApplicationStart;
+/**
+ * Start interface exposed to the legacy platform via the `ui/new_platform` module.
+ *
+ * @remarks
+ * Some methods are not supported in the legacy platform and while present to make this type compatibile with
+ * {@link CoreStart}, unsupported methods will throw exceptions when called.
+ *
+ * @public
+ * @deprecated
+ */
+export interface LegacyCoreStart extends CoreStart {
+  /** @deprecated */
   injectedMetadata: InjectedMetadataStart;
 }
 
diff --git a/src/core/public/legacy/legacy_service.test.ts b/src/core/public/legacy/legacy_service.test.ts
index 060ab6f62ad07d..37e07af0a7da58 100644
--- a/src/core/public/legacy/legacy_service.test.ts
+++ b/src/core/public/legacy/legacy_service.test.ts
@@ -61,7 +61,7 @@ import { docLinksServiceMock } from '../doc_links/doc_links_service.mock';
 import { savedObjectsMock } from '../saved_objects/saved_objects_service.mock';
 import { contextServiceMock } from '../context/context_service.mock';
 
-const applicationSetup = applicationServiceMock.createSetupContract();
+const applicationSetup = applicationServiceMock.createInternalSetupContract();
 const contextSetup = contextServiceMock.createSetupContract();
 const fatalErrorsSetup = fatalErrorsServiceMock.createSetupContract();
 const httpSetup = httpServiceMock.createSetupContract();
@@ -88,7 +88,7 @@ const defaultSetupDeps = {
   plugins: {},
 };
 
-const applicationStart = applicationServiceMock.createStartContract();
+const applicationStart = applicationServiceMock.createInternalStartContract();
 const docLinksStart = docLinksServiceMock.createStartContract();
 const httpStart = httpServiceMock.createStartContract();
 const chromeStart = chromeServiceMock.createStartContract();
@@ -134,7 +134,7 @@ describe('#setup()', () => {
       legacyPlatform.setup(defaultSetupDeps);
 
       expect(mockUiNewPlatformSetup).toHaveBeenCalledTimes(1);
-      expect(mockUiNewPlatformSetup).toHaveBeenCalledWith(defaultSetupDeps.core, {});
+      expect(mockUiNewPlatformSetup).toHaveBeenCalledWith(expect.any(Object), {});
     });
   });
 });
@@ -166,7 +166,7 @@ describe('#start()', () => {
     legacyPlatform.start(defaultStartDeps);
 
     expect(mockUiNewPlatformStart).toHaveBeenCalledTimes(1);
-    expect(mockUiNewPlatformStart).toHaveBeenCalledWith(defaultStartDeps.core, {});
+    expect(mockUiNewPlatformStart).toHaveBeenCalledWith(expect.any(Object), {});
   });
 
   describe('useLegacyTestHarness = false', () => {
diff --git a/src/core/public/legacy/legacy_service.ts b/src/core/public/legacy/legacy_service.ts
index 73f4682debe50e..6abc195a77b4bc 100644
--- a/src/core/public/legacy/legacy_service.ts
+++ b/src/core/public/legacy/legacy_service.ts
@@ -18,7 +18,8 @@
  */
 
 import angular from 'angular';
-import { InternalCoreSetup, InternalCoreStart } from '../';
+import { InternalCoreSetup, InternalCoreStart } from '../core_system';
+import { LegacyCoreSetup, LegacyCoreStart } from '../';
 
 /** @internal */
 export interface LegacyPlatformParams {
@@ -70,10 +71,18 @@ export class LegacyPlatformService {
       })
     );
 
+    const legacyCore: LegacyCoreSetup = {
+      ...core,
+      application: {
+        register: notSupported(`core.application.register()`),
+        registerMountContext: notSupported(`core.application.registerMountContext()`),
+      },
+    };
+
     // Inject parts of the new platform into parts of the legacy platform
     // so that legacy APIs/modules can mimic their new platform counterparts
     if (core.injectedMetadata.getLegacyMode()) {
-      require('ui/new_platform').__setup__(core, plugins);
+      require('ui/new_platform').__setup__(legacyCore, plugins);
     }
   }
 
@@ -99,9 +108,18 @@ export class LegacyPlatformService {
       return;
     }
 
+    const legacyCore: LegacyCoreStart = {
+      ...core,
+      application: {
+        capabilities: core.application.capabilities,
+        navigateToApp: core.application.navigateToApp,
+        registerMountContext: notSupported(`core.application.registerMountContext()`),
+      },
+    };
+
     // Inject parts of the new platform into parts of the legacy platform
     // so that legacy APIs/modules can mimic their new platform counterparts
-    require('ui/new_platform').__start__(core, plugins);
+    require('ui/new_platform').__start__(legacyCore, plugins);
 
     // Load the bootstrap module before loading the legacy platform files so that
     // the bootstrap module can modify the environment a bit first
@@ -155,3 +173,7 @@ export class LegacyPlatformService {
     return require('ui/chrome');
   }
 }
+
+const notSupported = (methodName: string) => (...args: any[]) => {
+  throw new Error(`${methodName} is not supported in the legacy platform.`);
+};
diff --git a/src/core/public/plugins/plugins_service.ts b/src/core/public/plugins/plugins_service.ts
index 13a52d78d72fc0..1ab9d7f2fa9b29 100644
--- a/src/core/public/plugins/plugins_service.ts
+++ b/src/core/public/plugins/plugins_service.ts
@@ -26,7 +26,7 @@ import {
   createPluginSetupContext,
   createPluginStartContext,
 } from './plugin_context';
-import { InternalCoreSetup, InternalCoreStart } from '..';
+import { InternalCoreSetup, InternalCoreStart } from '../core_system';
 
 /** @internal */
 export type PluginsServiceSetupDeps = InternalCoreSetup;
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index b9541b576c04c0..aa4763088b8202 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -8,7 +8,6 @@ import { IconType } from '@elastic/eui';
 import { Observable } from 'rxjs';
 import React from 'react';
 import * as Rx from 'rxjs';
-import { Subject } from 'rxjs';
 import { EuiGlobalToastListToast as Toast } from '@elastic/eui';
 
 // @public
@@ -238,7 +237,7 @@ export interface CoreSetup {
 // @public
 export interface CoreStart {
     // (undocumented)
-    application: Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'registerMountContext'>;
+    application: ApplicationStart;
     // (undocumented)
     chrome: ChromeStart;
     // (undocumented)
@@ -543,27 +542,19 @@ export type IContextHandler<TContext extends {}, TReturn, THandlerParameters ext
 // @public
 export type IContextProvider<TContext extends Record<string, any>, TContextName extends keyof TContext, TProviderParameters extends any[] = []> = (context: Partial<TContext>, ...rest: TProviderParameters) => Promise<TContext[TContextName]> | TContext[TContextName];
 
-// @internal (undocumented)
-export interface InternalCoreSetup extends Omit<CoreSetup, 'application'> {
-    // Warning: (ae-forgotten-export) The symbol "InternalApplicationSetup" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    application: InternalApplicationSetup;
+// @public @deprecated
+export interface LegacyCoreSetup extends CoreSetup {
     // Warning: (ae-forgotten-export) The symbol "InjectedMetadataSetup" needs to be exported by the entry point index.d.ts
     // 
-    // (undocumented)
+    // @deprecated (undocumented)
     injectedMetadata: InjectedMetadataSetup;
 }
 
-// @internal (undocumented)
-export interface InternalCoreStart extends Omit<CoreStart, 'application'> {
-    // Warning: (ae-forgotten-export) The symbol "InternalApplicationStart" needs to be exported by the entry point index.d.ts
-    // 
-    // (undocumented)
-    application: InternalApplicationStart;
+// @public @deprecated
+export interface LegacyCoreStart extends CoreStart {
     // Warning: (ae-forgotten-export) The symbol "InjectedMetadataStart" needs to be exported by the entry point index.d.ts
     // 
-    // (undocumented)
+    // @deprecated (undocumented)
     injectedMetadata: InjectedMetadataStart;
 }
 
diff --git a/src/legacy/ui/public/legacy_compat/angular_config.tsx b/src/legacy/ui/public/legacy_compat/angular_config.tsx
index 1e22003b328338..28d57e9f8e8c98 100644
--- a/src/legacy/ui/public/legacy_compat/angular_config.tsx
+++ b/src/legacy/ui/public/legacy_compat/angular_config.tsx
@@ -33,7 +33,7 @@ import * as Rx from 'rxjs';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { InternalCoreStart } from 'kibana/public';
+import { CoreStart, LegacyCoreStart } from 'kibana/public';
 
 import { fatalError } from 'ui/notify';
 import { capabilities } from 'ui/capabilities';
@@ -77,7 +77,7 @@ export const configureAppAngularModule = (angularModule: IModule) => {
     .run($setupUrlOverflowHandling(newPlatform));
 };
 
-const getEsUrl = (newPlatform: InternalCoreStart) => {
+const getEsUrl = (newPlatform: CoreStart) => {
   const a = document.createElement('a');
   a.href = newPlatform.http.basePath.prepend('/elasticsearch');
   const protocolPort = /https/.test(a.protocol) ? 443 : 80;
@@ -90,7 +90,7 @@ const getEsUrl = (newPlatform: InternalCoreStart) => {
   };
 };
 
-const setupCompileProvider = (newPlatform: InternalCoreStart) => (
+const setupCompileProvider = (newPlatform: LegacyCoreStart) => (
   $compileProvider: ICompileProvider
 ) => {
   if (!newPlatform.injectedMetadata.getLegacyMetadata().devMode) {
@@ -98,7 +98,7 @@ const setupCompileProvider = (newPlatform: InternalCoreStart) => (
   }
 };
 
-const setupLocationProvider = (newPlatform: InternalCoreStart) => (
+const setupLocationProvider = (newPlatform: CoreStart) => (
   $locationProvider: ILocationProvider
 ) => {
   $locationProvider.html5Mode({
@@ -110,7 +110,7 @@ const setupLocationProvider = (newPlatform: InternalCoreStart) => (
   $locationProvider.hashPrefix('');
 };
 
-export const $setupXsrfRequestInterceptor = (newPlatform: InternalCoreStart) => {
+export const $setupXsrfRequestInterceptor = (newPlatform: LegacyCoreStart) => {
   const version = newPlatform.injectedMetadata.getLegacyMetadata().version;
 
   // Configure jQuery prefilter
@@ -145,7 +145,7 @@ export const $setupXsrfRequestInterceptor = (newPlatform: InternalCoreStart) =>
  * @param  {HttpService} $http
  * @return {undefined}
  */
-const capture$httpLoadingCount = (newPlatform: InternalCoreStart) => (
+const capture$httpLoadingCount = (newPlatform: CoreStart) => (
   $rootScope: IRootScopeService,
   $http: IHttpService
 ) => {
@@ -166,7 +166,7 @@ const capture$httpLoadingCount = (newPlatform: InternalCoreStart) => (
  * lets us integrate with the angular router so that we can automatically clear
  * the breadcrumbs if we switch to a Kibana app that does not use breadcrumbs correctly
  */
-const $setupBreadcrumbsAutoClear = (newPlatform: InternalCoreStart) => (
+const $setupBreadcrumbsAutoClear = (newPlatform: CoreStart) => (
   $rootScope: IRootScopeService,
   $injector: any
 ) => {
@@ -213,7 +213,7 @@ const $setupBreadcrumbsAutoClear = (newPlatform: InternalCoreStart) => (
  * lets us integrate with the angular router so that we can automatically clear
  * the badge if we switch to a Kibana app that does not use the badge correctly
  */
-const $setupBadgeAutoClear = (newPlatform: InternalCoreStart) => (
+const $setupBadgeAutoClear = (newPlatform: CoreStart) => (
   $rootScope: IRootScopeService,
   $injector: any
 ) => {
@@ -253,7 +253,7 @@ const $setupBadgeAutoClear = (newPlatform: InternalCoreStart) => (
  * the helpExtension if we switch to a Kibana app that does not set its own
  * helpExtension
  */
-const $setupHelpExtensionAutoClear = (newPlatform: InternalCoreStart) => (
+const $setupHelpExtensionAutoClear = (newPlatform: CoreStart) => (
   $rootScope: IRootScopeService,
   $injector: any
 ) => {
@@ -285,7 +285,7 @@ const $setupHelpExtensionAutoClear = (newPlatform: InternalCoreStart) => (
   });
 };
 
-const $setupUrlOverflowHandling = (newPlatform: InternalCoreStart) => (
+const $setupUrlOverflowHandling = (newPlatform: CoreStart) => (
   $location: ILocationService,
   $rootScope: IRootScopeService,
   Private: any,
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index 5e0eb2feeb4501..1afc941de06416 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { InternalCoreSetup, InternalCoreStart } from '../../../../core/public';
+import { LegacyCoreSetup, LegacyCoreStart } from '../../../../core/public';
 import { Plugin as DataPlugin } from '../../../../plugins/data/public';
 import {
   Setup as InspectorSetup,
@@ -34,32 +34,32 @@ export interface PluginsStart {
 }
 
 export const npSetup = {
-  core: (null as unknown) as InternalCoreSetup,
+  core: (null as unknown) as LegacyCoreSetup,
   plugins: {} as PluginsSetup,
 };
 
 export const npStart = {
-  core: (null as unknown) as InternalCoreStart,
+  core: (null as unknown) as LegacyCoreStart,
   plugins: {} as PluginsStart,
 };
 
 /**
  * Only used by unit tests
- * @internal
+ * @Legacy
  */
 export function __reset__() {
-  npSetup.core = (null as unknown) as InternalCoreSetup;
+  npSetup.core = (null as unknown) as LegacyCoreSetup;
   npSetup.plugins = {} as any;
-  npStart.core = (null as unknown) as InternalCoreStart;
+  npStart.core = (null as unknown) as LegacyCoreStart;
   npStart.plugins = {} as any;
 }
 
-export function __setup__(coreSetup: InternalCoreSetup, plugins: PluginsSetup) {
+export function __setup__(coreSetup: LegacyCoreSetup, plugins: PluginsSetup) {
   npSetup.core = coreSetup;
   npSetup.plugins = plugins;
 }
 
-export function __start__(coreStart: InternalCoreStart, plugins: PluginsStart) {
+export function __start__(coreStart: LegacyCoreStart, plugins: PluginsStart) {
   npStart.core = coreStart;
   npStart.plugins = plugins;
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx b/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
index 5eb2626f448728..e5620ee7710439 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
@@ -7,7 +7,7 @@
 import { Location } from 'history';
 import { last } from 'lodash';
 import React from 'react';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 import { useCore } from '../../../hooks/useCore';
 import { getAPMHref } from '../../shared/Links/apm/APMLink';
 import { Breadcrumb, ProvideBreadcrumbs } from './ProvideBreadcrumbs';
@@ -16,7 +16,7 @@ import { routes } from './route_config';
 interface Props {
   location: Location;
   breadcrumbs: Breadcrumb[];
-  core: InternalCoreStart;
+  core: LegacyCoreStart;
 }
 
 class UpdateBreadcrumbsComponent extends React.Component<Props> {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx
index 134934ff8425e1..982f60a53d895c 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx
@@ -31,7 +31,7 @@ import moment from 'moment-timezone';
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import { toastNotifications } from 'ui/notify';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { KibanaLink } from '../../../shared/Links/KibanaLink';
 import { createErrorGroupWatch, Schedule } from './createErrorGroupWatch';
@@ -40,7 +40,7 @@ import { CoreContext } from '../../../../context/CoreContext';
 
 type ScheduleKey = keyof Schedule;
 
-const getUserTimezone = memoize((core: InternalCoreStart): string => {
+const getUserTimezone = memoize((core: LegacyCoreStart): string => {
   return core.uiSettings.get('dateFormat:tz') === 'Browser'
     ? moment.tz.guess()
     : core.uiSettings.get('dateFormat:tz');
@@ -156,7 +156,7 @@ export class WatcherFlyout extends Component<
   };
 
   public createWatch = () => {
-    const core: InternalCoreStart = this.context;
+    const core: LegacyCoreStart = this.context;
     const { serviceName } = this.props.urlParams;
 
     if (!serviceName) {
@@ -278,7 +278,7 @@ export class WatcherFlyout extends Component<
       return null;
     }
 
-    const core: InternalCoreStart = this.context;
+    const core: LegacyCoreStart = this.context;
     const userTimezoneSetting = getUserTimezone(core);
     const dailyTime = this.state.daily;
     const inputTime = `${dailyTime}Z`; // Add tz to make into UTC
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx
index 513c58d7a834a6..820bc6b2595cf9 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx
@@ -13,7 +13,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { memoize } from 'lodash';
 import React, { Fragment } from 'react';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 import { idx } from '@kbn/elastic-idx';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { LicenseContext } from '../../../../context/LicenseContext';
@@ -67,7 +67,7 @@ export class ServiceIntegrations extends React.Component<Props, State> {
   };
 
   public getWatcherPanelItems = () => {
-    const core: InternalCoreStart = this.context;
+    const core: LegacyCoreStart = this.context;
 
     return [
       {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
index b29428cc555eda..c20672745a99c0 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
@@ -12,7 +12,7 @@ import * as callApmApi from '../../../../services/rest/callApmApi';
 import { ServiceOverview } from '..';
 import * as urlParamsHooks from '../../../../hooks/useUrlParams';
 import * as coreHooks from '../../../../hooks/useCore';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 import * as useLocalUIFilters from '../../../../hooks/useLocalUIFilters';
 import { FETCH_STATUS } from '../../../../hooks/useFetcher';
 
@@ -30,7 +30,7 @@ describe('Service Overview -> View', () => {
           prepend: (path: string) => `/basepath${path}`
         }
       }
-    } as unknown) as InternalCoreStart;
+    } as unknown) as LegacyCoreStart;
 
     // mock urlParams
     spyOn(urlParamsHooks, 'useUrlParams').and.returnValue({
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/DiscoverLinks/__test__/DiscoverLinks.integration.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/DiscoverLinks/__test__/DiscoverLinks.integration.test.tsx
index 80cecd8ea7f4d8..23331f316084fa 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/DiscoverLinks/__test__/DiscoverLinks.integration.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/DiscoverLinks/__test__/DiscoverLinks.integration.test.tsx
@@ -15,7 +15,7 @@ import { DiscoverErrorLink } from '../DiscoverErrorLink';
 import { DiscoverSpanLink } from '../DiscoverSpanLink';
 import { DiscoverTransactionLink } from '../DiscoverTransactionLink';
 import * as hooks from '../../../../../hooks/useCore';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
 jest.mock('ui/kfetch');
 
@@ -32,7 +32,7 @@ beforeAll(() => {
         prepend: (path: string) => `/basepath${path}`
       }
     }
-  } as unknown) as InternalCoreStart;
+  } as unknown) as LegacyCoreStart;
 
   jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
 });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/InfraLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/InfraLink.test.tsx
index 9925d87a159cad..5221831fa57e88 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/InfraLink.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/InfraLink.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { getRenderedHref } from '../../../utils/testHelpers';
 import { InfraLink } from './InfraLink';
 import * as hooks from '../../../hooks/useCore';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
 const coreMock = ({
   http: {
@@ -17,7 +17,7 @@ const coreMock = ({
       prepend: (path: string) => `/basepath${path}`
     }
   }
-} as unknown) as InternalCoreStart;
+} as unknown) as LegacyCoreStart;
 
 jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/KibanaLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/KibanaLink.test.tsx
index 24637f971bf3c8..a5b27403510173 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/KibanaLink.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/KibanaLink.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { getRenderedHref } from '../../../utils/testHelpers';
 import { KibanaLink } from './KibanaLink';
 import * as hooks from '../../../hooks/useCore';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
 describe('KibanaLink', () => {
   beforeEach(() => {
@@ -19,7 +19,7 @@ describe('KibanaLink', () => {
           prepend: (path: string) => `/basepath${path}`
         }
       }
-    } as unknown) as InternalCoreStart;
+    } as unknown) as LegacyCoreStart;
 
     jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
   });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLJobLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLJobLink.test.tsx
index c577a38029d29a..2fbb700a8eca1c 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLJobLink.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLJobLink.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { getRenderedHref } from '../../../../utils/testHelpers';
 import { MLJobLink } from './MLJobLink';
 import * as hooks from '../../../../hooks/useCore';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
 describe('MLJobLink', () => {
   beforeEach(() => {
@@ -19,7 +19,7 @@ describe('MLJobLink', () => {
           prepend: (path: string) => `/basepath${path}`
         }
       }
-    } as unknown) as InternalCoreStart;
+    } as unknown) as LegacyCoreStart;
 
     spyOn(hooks, 'useCore').and.returnValue(coreMock);
   });
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
index 5f66cf8563260c..8eb1c9a3ec1960 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx
@@ -10,7 +10,7 @@ import { getRenderedHref } from '../../../../utils/testHelpers';
 import { MLLink } from './MLLink';
 import * as savedObjects from '../../../../services/rest/savedObjects';
 import * as hooks from '../../../../hooks/useCore';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
 jest.mock('ui/kfetch');
 
@@ -20,7 +20,7 @@ const coreMock = ({
       prepend: (path: string) => `/basepath${path}`
     }
   }
-} as unknown) as InternalCoreStart;
+} as unknown) as LegacyCoreStart;
 
 jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
 
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
index 89adbd5c0d832a..4fa5751b3578b5 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
@@ -13,7 +13,7 @@ import * as Transactions from './mockData';
 import * as apmIndexPatternHooks from '../../../../hooks/useAPMIndexPattern';
 import * as coreHoooks from '../../../../hooks/useCore';
 import { ISavedObject } from '../../../../services/rest/savedObjects';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
 jest.mock('ui/kfetch');
 
@@ -35,7 +35,7 @@ describe('TransactionActionMenu component', () => {
           prepend: (path: string) => `/basepath${path}`
         }
       }
-    } as unknown) as InternalCoreStart;
+    } as unknown) as LegacyCoreStart;
 
     jest
       .spyOn(apmIndexPatternHooks, 'useAPMIndexPattern')
diff --git a/x-pack/legacy/plugins/apm/public/context/CoreContext.tsx b/x-pack/legacy/plugins/apm/public/context/CoreContext.tsx
index 0bf39e4d9dadb6..5e260f4a1c7b70 100644
--- a/x-pack/legacy/plugins/apm/public/context/CoreContext.tsx
+++ b/x-pack/legacy/plugins/apm/public/context/CoreContext.tsx
@@ -5,10 +5,10 @@
  */
 
 import React, { createContext } from 'react';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 
-const CoreContext = createContext<InternalCoreStart>({} as InternalCoreStart);
-const CoreProvider: React.SFC<{ core: InternalCoreStart }> = props => {
+const CoreContext = createContext<LegacyCoreStart>({} as LegacyCoreStart);
+const CoreProvider: React.SFC<{ core: LegacyCoreStart }> = props => {
   const { core, ...restProps } = props;
   return <CoreContext.Provider value={core} {...restProps} />;
 };
diff --git a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
index abd793245cbb69..b6f659e1749cf6 100644
--- a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
+++ b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Route, Switch } from 'react-router-dom';
 import styled from 'styled-components';
-import { InternalCoreStart } from 'src/core/public';
+import { LegacyCoreStart } from 'src/core/public';
 import { history } from '../utils/history';
 import { CoreProvider } from '../context/CoreContext';
 import { LocationProvider } from '../context/LocationContext';
@@ -54,7 +54,7 @@ const App = () => {
 };
 
 export class Plugin {
-  public start(core: InternalCoreStart) {
+  public start(core: LegacyCoreStart) {
     const { i18n } = core;
     ReactDOM.render(
       <CoreProvider core={core}>

From bef01aa67bc6233c86ccf0e53c3f3c3d48594ff7 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 12 Aug 2019 14:18:47 -0500
Subject: [PATCH 04/14] Fix PR comments

---
 ...plugin-public.applicationsetup.register.md |  2 +-
 ...c.applicationsetup.registermountcontext.md |  4 ++--
 ...c.applicationstart.registermountcontext.md |  2 +-
 ...bana-plugin-public.appmountcontextnames.md | 12 +++++++++++
 .../core/public/kibana-plugin-public.md       |  1 +
 .../application/application_service.tsx       | 11 ++++++----
 src/core/public/application/index.ts          |  1 +
 src/core/public/application/types.ts          | 21 +++++++++++--------
 .../public/application/ui/app_container.tsx   |  3 +--
 src/core/public/chrome/chrome_service.mock.ts |  2 +-
 src/core/public/chrome/chrome_service.test.ts |  2 +-
 src/core/public/chrome/chrome_service.tsx     |  4 ++--
 src/core/public/index.ts                      | 10 ++++++++-
 src/core/public/public.api.md                 |  7 +++++--
 .../rendering/rendering_service.test.tsx      |  2 +-
 .../public/rendering/rendering_service.tsx    |  2 +-
 .../ui/public/new_platform/new_platform.ts    |  2 +-
 17 files changed, 59 insertions(+), 29 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-public.appmountcontextnames.md

diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
index a24eb19c2ea6bb..50bcc28fd17135 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
@@ -16,7 +16,7 @@ register(app: App): void;
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  app | <code>App</code> |  |
+|  app | <code>App</code> | an [App](./kibana-plugin-public.app.md) |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
index cda400df6d0294..7c32e63efe7de6 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
@@ -9,7 +9,7 @@ Register a context provider for application mounting. Will only be available to
 <b>Signature:</b>
 
 ```typescript
-registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, keyof AppMountContext>): void;
+registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 ```
 
 ## Parameters
@@ -17,7 +17,7 @@ registerMountContext<T extends keyof AppMountContext>(contextName: T, provider:
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  contextName | <code>T</code> | The key of [AppMountContext](./kibana-plugin-public.appmountcontext.md) this provider's return value should be attached to. |
-|  provider | <code>IContextProvider&lt;AppMountContext, keyof AppMountContext&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
+|  provider | <code>IContextProvider&lt;AppMountContext, T&gt;</code> | A [IContextProvider](./kibana-plugin-public.icontextprovider.md) function |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md b/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
index fc86aaf658b681..9042bf2accd2b3 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
@@ -9,7 +9,7 @@ Register a context provider for application mounting. Will only be available to
 <b>Signature:</b>
 
 ```typescript
-registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 ```
 
 ## Parameters
diff --git a/docs/development/core/public/kibana-plugin-public.appmountcontextnames.md b/docs/development/core/public/kibana-plugin-public.appmountcontextnames.md
new file mode 100644
index 00000000000000..fa83ebc86d6c16
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.appmountcontextnames.md
@@ -0,0 +1,12 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountContextNames](./kibana-plugin-public.appmountcontextnames.md)
+
+## AppMountContextNames type
+
+
+<b>Signature:</b>
+
+```typescript
+export declare type AppMountContextNames = keyof AppMountContext;
+```
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index ccabdc62c5e7a2..3adccbf10c432b 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -86,6 +86,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Type Alias | Description |
 |  --- | --- |
+|  [AppMountContextNames](./kibana-plugin-public.appmountcontextnames.md) |  |
 |  [AppUnmount](./kibana-plugin-public.appunmount.md) | A function called when an application should be unmounted from the page. This function should be synchronous. |
 |  [ChromeHelpExtension](./kibana-plugin-public.chromehelpextension.md) |  |
 |  [ChromeNavLinkUpdateableFields](./kibana-plugin-public.chromenavlinkupdateablefields.md) |  |
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 62178eebf0d705..5f33a9253c5131 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -25,8 +25,7 @@ import { InjectedMetadataStart } from '../injected_metadata';
 import { CapabilitiesService } from './capabilities';
 import { AppRouter } from './ui';
 import { HttpStart } from '../http';
-import { IContextContainer } from '../context';
-import { ContextSetup } from '../context/context_service';
+import { ContextSetup, IContextContainer } from '../context';
 import {
   AppMountContext,
   App,
@@ -93,7 +92,7 @@ export class ApplicationService {
         if (this.legacyApps$.value.has(app.id)) {
           throw new Error(`A legacy application is already registered with the id "${app.id}"`);
         }
-        if (this.apps$.isStopped) {
+        if (this.legacyApps$.isStopped) {
           throw new Error(`Applications cannot be registered after "setup"`);
         }
 
@@ -153,6 +152,10 @@ export class ApplicationService {
       },
 
       getComponent: () => {
+        if (legacyMode) {
+          return null;
+        }
+
         // Filter only available apps and map to just the mount function.
         const appMounters = new Map<string, AppMounter>(
           [...this.apps$.value]
@@ -160,7 +163,7 @@ export class ApplicationService {
             .map(([id, { mount }]) => [id, mount])
         );
 
-        return legacyMode ? null : (
+        return (
           <AppRouter
             apps={appMounters}
             legacyApps={availableLegacyApps}
diff --git a/src/core/public/application/index.ts b/src/core/public/application/index.ts
index ae25b54cf07a84..7a4c6df5284bf5 100644
--- a/src/core/public/application/index.ts
+++ b/src/core/public/application/index.ts
@@ -24,6 +24,7 @@ export {
   AppBase,
   AppUnmount,
   AppMountContext,
+  AppMountContextNames,
   AppMountParameters,
   ApplicationSetup,
   ApplicationStart,
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 88346eded86f27..ac0b8504d26756 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -117,6 +117,9 @@ export interface AppMountContext {
   };
 }
 
+/** @public */
+export type AppMountContextNames = keyof AppMountContext;
+
 /** @public */
 export interface AppMountParameters {
   /**
@@ -180,7 +183,7 @@ export type AppMounter = (params: AppMountParameters) => Promise<AppUnmount>;
 export interface ApplicationSetup {
   /**
    * Register an mountable application to the system. Apps will be mounted based on their `rootRoute`.
-   * @param app
+   * @param app - an {@link App}
    */
   register(app: App): void;
 
@@ -191,9 +194,9 @@ export interface ApplicationSetup {
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends keyof AppMountContext>(
+  registerMountContext<T extends AppMountContextNames>(
     contextName: T,
-    provider: IContextProvider<AppMountContext, keyof AppMountContext>
+    provider: IContextProvider<AppMountContext, T>
   ): void;
 }
 
@@ -204,7 +207,7 @@ export interface InternalApplicationSetup {
    * @param plugin - opaque ID of the plugin that registers this application
    * @param app
    */
-  register(plugin: symbol, app: App): void;
+  register(plugin: PluginOpaqueId, app: App): void;
 
   /**
    * Register metadata about legacy applications. Legacy apps will not be mounted when navigated to.
@@ -221,10 +224,10 @@ export interface InternalApplicationSetup {
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends keyof AppMountContext>(
-    pluginOpaqueId: symbol,
+  registerMountContext<T extends AppMountContextNames>(
+    pluginOpaqueId: PluginOpaqueId,
     contextName: T,
-    provider: IContextProvider<AppMountContext, keyof AppMountContext>
+    provider: IContextProvider<AppMountContext, T>
   ): void;
 }
 
@@ -252,7 +255,7 @@ export interface ApplicationStart {
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends keyof AppMountContext>(
+  registerMountContext<T extends AppMountContextNames>(
     contextName: T,
     provider: IContextProvider<AppMountContext, T>
   ): void;
@@ -281,7 +284,7 @@ export interface InternalApplicationStart
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends keyof AppMountContext>(
+  registerMountContext<T extends AppMountContextNames>(
     pluginOpaqueId: PluginOpaqueId,
     contextName: T,
     provider: IContextProvider<AppMountContext, T>
diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
index 1c54f9aa54b6a9..641a08f57aeca1 100644
--- a/src/core/public/application/ui/app_container.tsx
+++ b/src/core/public/application/ui/app_container.tsx
@@ -82,8 +82,7 @@ export class AppContainer extends React.Component<Props, State> {
 
     const legacyApp = findLegacyApp(appId, legacyApps);
     if (legacyApp) {
-      // Give the current app a chance to shutdown
-      await this.unmountApp();
+      this.unmountApp();
       redirectTo(basePath.prepend(`/app/${appId}`));
       this.setState({ appNotFound: false });
       return;
diff --git a/src/core/public/chrome/chrome_service.mock.ts b/src/core/public/chrome/chrome_service.mock.ts
index 74f2a09b895dee..3775989c5126b4 100644
--- a/src/core/public/chrome/chrome_service.mock.ts
+++ b/src/core/public/chrome/chrome_service.mock.ts
@@ -27,7 +27,7 @@ import {
 
 const createStartContractMock = () => {
   const startContract: DeeplyMockedKeys<InternalChromeStart> = {
-    getComponent: jest.fn(),
+    getHeaderComponent: jest.fn(),
     navLinks: {
       getNavLinks$: jest.fn(),
       has: jest.fn(),
diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
index 9a7d87b449b19c..45e94040eeb4a3 100644
--- a/src/core/public/chrome/chrome_service.test.ts
+++ b/src/core/public/chrome/chrome_service.test.ts
@@ -87,7 +87,7 @@ Array [
       const start = await service.start(defaultStartDeps());
       // Have to do some fanagling to get the type system and enzyme to accept this.
       // Don't capture the snapshot because it's 600+ lines long.
-      expect(shallow(React.createElement(() => start.getComponent()))).toBeDefined();
+      expect(shallow(React.createElement(() => start.getHeaderComponent()))).toBeDefined();
     });
   });
 
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 0fd68619b73cf1..c8946bf2c98a46 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -124,7 +124,7 @@ export class ChromeService {
       navLinks,
       recentlyAccessed,
 
-      getComponent: () => (
+      getHeaderComponent: () => (
         <React.Fragment>
           <LoadingIndicator loadingCount$={http.getLoadingCount$()} />
 
@@ -375,5 +375,5 @@ export interface InternalChromeStart extends ChromeStart {
    * Used only by MountingService to render the header UI
    * @internal
    */
-  getComponent(): JSX.Element;
+  getHeaderComponent(): JSX.Element;
 }
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 2cbb7a50442613..ee97e337928aa6 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -72,7 +72,15 @@ import { IContextContainer, IContextProvider, ContextSetup, IContextHandler } fr
 export { CoreContext, CoreSystem } from './core_system';
 export { RecursiveReadonly } from '../utils';
 
-export { App, AppBase, AppUnmount, AppMountContext, AppMountParameters } from './application';
+export {
+  App,
+  AppBase,
+  AppUnmount,
+  AppMountContext,
+  AppMountContextNames,
+  AppMountParameters,
+} from './application';
+
 export {
   SavedObjectsBatchResponse,
   SavedObjectsBulkCreateObject,
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index aa4763088b8202..0f01a91da94cb8 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -30,7 +30,7 @@ export interface AppBase {
 // @public (undocumented)
 export interface ApplicationSetup {
     register(app: App): void;
-    registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, keyof AppMountContext>): void;
+    registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 }
 
 // @public (undocumented)
@@ -40,7 +40,7 @@ export interface ApplicationStart {
         path?: string;
         state?: any;
     }): void;
-    registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+    registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 }
 
 // @public
@@ -57,6 +57,9 @@ export interface AppMountContext {
     };
 }
 
+// @public (undocumented)
+export type AppMountContextNames = keyof AppMountContext;
+
 // @public (undocumented)
 export interface AppMountParameters {
     appBasePath: string;
diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx
index f74014abf13532..4d6e7daa7b4ef0 100644
--- a/src/core/public/rendering/rendering_service.test.tsx
+++ b/src/core/public/rendering/rendering_service.test.tsx
@@ -31,7 +31,7 @@ describe('RenderingService#start', () => {
       getComponent: () => <div>Hello application!</div>,
     } as InternalApplicationStart;
     const chrome = chromeServiceMock.createStartContract();
-    chrome.getComponent.mockReturnValue(<div>Hello chrome!</div>);
+    chrome.getHeaderComponent.mockReturnValue(<div>Hello chrome!</div>);
     const injectedMetadata = injectedMetadataServiceMock.createStartContract();
     const targetDomElement = document.createElement('div');
     const start = rendering.start({ application, chrome, injectedMetadata, targetDomElement });
diff --git a/src/core/public/rendering/rendering_service.tsx b/src/core/public/rendering/rendering_service.tsx
index 23a96dc056846f..2e066feca8bf35 100644
--- a/src/core/public/rendering/rendering_service.tsx
+++ b/src/core/public/rendering/rendering_service.tsx
@@ -44,7 +44,7 @@ interface StartDeps {
  */
 export class RenderingService {
   start({ application, chrome, injectedMetadata, targetDomElement }: StartDeps): RenderingStart {
-    const chromeUi = chrome.getComponent();
+    const chromeUi = chrome.getHeaderComponent();
     const appUi = application.getComponent();
 
     const legacyMode = injectedMetadata.getLegacyMode();
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
index 1afc941de06416..4f55349e3efe26 100644
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -45,7 +45,7 @@ export const npStart = {
 
 /**
  * Only used by unit tests
- * @Legacy
+ * @internal
  */
 export function __reset__() {
   npSetup.core = (null as unknown) as LegacyCoreSetup;

From 8f8c6a0276e4a3b6c74fcc042ab855f5c87ed23d Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 12 Aug 2019 15:33:17 -0500
Subject: [PATCH 05/14] Add functional tests

---
 test/functional/page_objects/common_page.js   |  20 ++-
 .../core_plugin_a/public/application.tsx      | 137 +++++++++++++++++
 .../plugins/core_plugin_a/public/plugin.tsx   |  10 ++
 .../core_plugin_b/public/application.tsx      | 144 ++++++++++++++++++
 .../plugins/core_plugin_b/public/plugin.tsx   |  10 ++
 .../test_suites/core_plugins/applications.js  |  82 ++++++++++
 .../test_suites/core_plugins/index.js         |   1 +
 7 files changed, 399 insertions(+), 5 deletions(-)
 create mode 100644 test/plugin_functional/plugins/core_plugin_a/public/application.tsx
 create mode 100644 test/plugin_functional/plugins/core_plugin_b/public/application.tsx
 create mode 100644 test/plugin_functional/test_suites/core_plugins/applications.js

diff --git a/test/functional/page_objects/common_page.js b/test/functional/page_objects/common_page.js
index 651d82608961a4..bd483105373a88 100644
--- a/test/functional/page_objects/common_page.js
+++ b/test/functional/page_objects/common_page.js
@@ -151,11 +151,21 @@ export function CommonPageProvider({ getService, getPageObjects }) {
 
     navigateToApp(appName, { basePath = '', shouldLoginIfPrompted = true, shouldAcceptAlert = true, hash = '' } = {}) {
       const self = this;
-      const appConfig = config.get(['apps', appName]);
-      const appUrl = getUrl.noAuth(config.get('servers.kibana'), {
-        pathname: `${basePath}${appConfig.pathname}`,
-        hash: hash || appConfig.hash,
-      });
+
+      let appUrl;
+      if (config.has(['apps', appName])) {
+        // Legacy applications
+        const appConfig = config.get(['apps', appName]);
+        appUrl = getUrl.noAuth(config.get('servers.kibana'), {
+          pathname: `${basePath}${appConfig.pathname}`,
+          hash: hash || appConfig.hash,
+        });
+      } else {
+        appUrl = getUrl.noAuth(config.get('servers.kibana'), {
+          pathname: `${basePath}/app/${appName}`
+        });
+      }
+
       log.debug('navigating to ' + appName + ' url: ' + appUrl);
 
       function navigateTo(url) {
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
new file mode 100644
index 00000000000000..de82037cc1a49a
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -0,0 +1,137 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { BrowserRouter as Router, Route, withRouter, RouteComponentProps } from 'react-router-dom';
+
+import {
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageContentHeader,
+  EuiPageContentHeaderSection,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiPageSideBar,
+  EuiTitle,
+  EuiSideNav,
+} from '@elastic/eui';
+
+import { AppMountContext, AppMountParameters } from 'kibana/public';
+
+const Home = () => (
+  <EuiPageBody data-test-subj="foo-app-home">
+    <EuiPageHeader>
+      <EuiPageHeaderSection>
+        <EuiTitle size="l">
+          <h1>Welcome to Foo!</h1>
+        </EuiTitle>
+      </EuiPageHeaderSection>
+    </EuiPageHeader>
+    <EuiPageContent>
+      <EuiPageContentHeader>
+        <EuiPageContentHeaderSection>
+          <EuiTitle>
+            <h2>Bar home page section title</h2>
+          </EuiTitle>
+        </EuiPageContentHeaderSection>
+      </EuiPageContentHeader>
+      <EuiPageContentBody>Wow what a home page this is!</EuiPageContentBody>
+    </EuiPageContent>
+  </EuiPageBody>
+);
+
+const PageA = () => (
+  <EuiPageBody data-test-subj="foo-app-page-a">
+    <EuiPageHeader>
+      <EuiPageHeaderSection>
+        <EuiTitle size="l">
+          <h1>Page A</h1>
+        </EuiTitle>
+      </EuiPageHeaderSection>
+    </EuiPageHeader>
+    <EuiPageContent>
+      <EuiPageContentHeader>
+        <EuiPageContentHeaderSection>
+          <EuiTitle>
+            <h2>Page A section title</h2>
+          </EuiTitle>
+        </EuiPageContentHeaderSection>
+      </EuiPageContentHeader>
+      <EuiPageContentBody>Page A's content goes here</EuiPageContentBody>
+    </EuiPageContent>
+  </EuiPageBody>
+);
+
+type NavProps = RouteComponentProps & {
+  navigateToApp: AppMountContext['core']['application']['navigateToApp'];
+};
+const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
+  <EuiSideNav
+    items={[
+      {
+        name: 'Foo',
+        id: 'foo',
+        items: [
+          {
+            id: 'home',
+            name: 'Home',
+            onClick: () => history.push('/'),
+            'data-test-subj': 'foo-nav-home',
+          },
+          {
+            id: 'page-a',
+            name: 'Page A',
+            onClick: () => history.push('/page-a'),
+            'data-test-subj': 'foo-nav-page-a',
+          },
+          {
+            id: 'linktobar',
+            name: 'Open Bar / Page B',
+            onClick: () => navigateToApp('bar', { path: 'page-b?query=here', state: 'foo!!' }),
+            'data-test-subj': 'foo-nav-bar-page-b',
+          },
+        ],
+      },
+    ]}
+  />
+));
+
+const FooApp = ({ basename, context }: { basename: string; context: AppMountContext }) => (
+  <Router basename={basename}>
+    <EuiPage>
+      <EuiPageSideBar>
+        <Nav navigateToApp={context.core.application.navigateToApp} />
+      </EuiPageSideBar>
+      <Route path="/" exact component={Home} />
+      <Route path="/page-a" component={PageA} />
+    </EuiPage>
+  </Router>
+);
+
+export const renderApp = (
+  context: AppMountContext,
+  { appBasePath, element }: AppMountParameters
+) => {
+  ReactDOM.render(<FooApp basename={appBasePath} context={context} />, element);
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+};
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
index 263e87a173ddf9..be73ae28792db0 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
@@ -18,9 +18,19 @@
  */
 
 import { Plugin, CoreSetup } from 'kibana/public';
+import { renderApp } from './application';
 
 export class CorePluginAPlugin implements Plugin<CorePluginAPluginSetup, CorePluginAPluginStart> {
   public setup(core: CoreSetup, deps: {}) {
+    core.application.register({
+      id: 'foo',
+      title: 'Foo',
+      async mount(context, params) {
+        // Once dynamic imports are supported, replace with `await import()`
+        return renderApp(context, params);
+      },
+    });
+
     return {
       getGreeting() {
         return 'Hello from Plugin A!';
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
new file mode 100644
index 00000000000000..cba7de40a4d4b9
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
@@ -0,0 +1,144 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { BrowserRouter as Router, Route, withRouter, RouteComponentProps } from 'react-router-dom';
+
+import {
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageContentHeader,
+  EuiPageContentHeaderSection,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiPageSideBar,
+  EuiTitle,
+  EuiSideNav,
+} from '@elastic/eui';
+
+import { AppMountContext, AppMountParameters } from 'kibana/public';
+
+const Home = () => (
+  <EuiPageBody data-test-subj="bar-app-home">
+    <EuiPageHeader>
+      <EuiPageHeaderSection>
+        <EuiTitle size="l">
+          <h1>Welcome to Bar!</h1>
+        </EuiTitle>
+      </EuiPageHeaderSection>
+    </EuiPageHeader>
+    <EuiPageContent>
+      <EuiPageContentHeader>
+        <EuiPageContentHeaderSection>
+          <EuiTitle>
+            <h2>Bar home page sction</h2>
+          </EuiTitle>
+        </EuiPageContentHeaderSection>
+      </EuiPageContentHeader>
+      <EuiPageContentBody>It feels so homey!</EuiPageContentBody>
+    </EuiPageContent>
+  </EuiPageBody>
+);
+
+const PageB = ({ location }: RouteComponentProps) => {
+  const searchParams: any[] = [];
+  new URLSearchParams(location.search).forEach((value, key) => searchParams.push([key, value]));
+
+  return (
+    <EuiPageBody data-test-subj="bar-app-page-b">
+      <EuiPageHeader>
+        <EuiPageHeaderSection>
+          <EuiTitle size="l">
+            <h1>Page B</h1>
+          </EuiTitle>
+        </EuiPageHeaderSection>
+      </EuiPageHeader>
+      <EuiPageContent>
+        <EuiPageContentHeader>
+          <EuiPageContentHeaderSection>
+            <EuiTitle>
+              <h2>
+                Search params:{' '}
+                <span data-test-subj="bar-app-page-b-query">{JSON.stringify(searchParams)}</span>
+              </h2>
+            </EuiTitle>
+          </EuiPageContentHeaderSection>
+        </EuiPageContentHeader>
+      </EuiPageContent>
+    </EuiPageBody>
+  );
+};
+
+type NavProps = RouteComponentProps & {
+  navigateToApp: AppMountContext['core']['application']['navigateToApp'];
+};
+const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
+  <EuiSideNav
+    items={[
+      {
+        name: 'Bar',
+        id: 'bar',
+        items: [
+          {
+            id: 'home',
+            name: 'Home',
+            onClick: () => navigateToApp('bar', { path: '/' }),
+            'data-test-subj': 'bar-nav-home',
+          },
+          {
+            id: 'page-b',
+            name: 'Page B',
+            onClick: () => history.push('/page-b', { bar: 'page-b' }),
+            'data-test-subj': 'bar-nav-page-b',
+          },
+          {
+            id: 'linktofoo',
+            name: 'Open Foo',
+            onClick: () => navigateToApp('foo'),
+            'data-test-subj': 'bar-nav-foo-home',
+          },
+        ],
+      },
+    ]}
+  />
+));
+
+const BarApp = ({ basename, context }: { basename: string; context: AppMountContext }) => (
+  <Router basename={basename}>
+    <EuiPage>
+      <EuiPageSideBar>
+        <Nav navigateToApp={context.core.application.navigateToApp} />
+      </EuiPageSideBar>
+      <Route path="/" exact component={Home} />
+      <Route path="/page-b" component={PageB} />
+    </EuiPage>
+  </Router>
+);
+
+export const renderApp = (
+  context: AppMountContext,
+  { appBasePath, element }: AppMountParameters
+) => {
+  ReactDOM.render(<BarApp basename={appBasePath} context={context} />, element);
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+};
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
index 9ac49a88901445..9683f99153baa1 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@@ -19,6 +19,7 @@
 
 import { Plugin, CoreSetup } from 'kibana/public';
 import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin';
+import { renderApp } from './application';
 
 declare global {
   interface Window {
@@ -34,6 +35,15 @@ export class CorePluginBPlugin
   implements Plugin<CorePluginBPluginSetup, CorePluginBPluginStart, CorePluginBDeps> {
   public setup(core: CoreSetup, deps: CorePluginBDeps) {
     window.corePluginB = `Plugin A said: ${deps.core_plugin_a.getGreeting()}`;
+
+    core.application.register({
+      id: 'bar',
+      title: 'Bar',
+      async mount(context, params) {
+        // Once dynamic imports are supported, replace with `await import()`
+        return renderApp(context, params);
+      },
+    });
   }
 
   public start() {}
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.js b/test/plugin_functional/test_suites/core_plugins/applications.js
new file mode 100644
index 00000000000000..c11dc2b35adbb6
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/applications.js
@@ -0,0 +1,82 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+
+export default function ({ getService, getPageObjects }) {
+  const PageObjects = getPageObjects(['common']);
+
+  const browser = getService('browser');
+  const appsMenu = getService('appsMenu');
+  const testSubjects = getService('testSubjects');
+
+  describe('ui applications', function describeIndexTests() {
+    before(async () => {
+      await PageObjects.common.navigateToApp('foo');
+    });
+
+    it('starts on home page', async () => {
+      await testSubjects.existOrFail('foo-app-home');
+    });
+
+    it('navigates to its own pages', async () => {
+      // Go to page A
+      await testSubjects.click('foo-nav-page-a');
+      expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/page-a`);
+      await testSubjects.existOrFail('foo-app-page-a');
+      // Go to home page
+      await testSubjects.click('foo-nav-home');
+      expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/`);
+      await testSubjects.existOrFail('foo-app-home');
+    });
+
+    it('can use the back button to navigate within an app', async () => {
+      await browser.goBack();
+      expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/page-a`);
+      await testSubjects.existOrFail('foo-app-page-a');
+    });
+
+    it('navigates to other apps', async () => {
+      await testSubjects.click('foo-nav-bar-page-b');
+      await testSubjects.existOrFail('bar-app-page-b');
+      expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/bar/page-b?query=here`);
+    });
+
+    it('preserves query parameters across apps', async () => {
+      const querySpan = await testSubjects.find('bar-app-page-b-query');
+      expect(await querySpan.getVisibleText()).to.eql(`[["query","here"]]`);
+    });
+
+    it('can use the back button to navigate back to previous app', async () => {
+      await browser.goBack();
+      expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/page-a`);
+      await testSubjects.existOrFail('foo-app-page-a');
+    });
+
+    it('can navigate from NP apps to legacy apps', async () => {
+      await appsMenu.clickLink('Management');
+      await testSubjects.existOrFail('managementNav');
+    });
+
+    it('can navigate from legacy apps to NP apps', async () => {
+      await appsMenu.clickLink('Foo');
+      await testSubjects.existOrFail('foo-app-home');
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/index.js b/test/plugin_functional/test_suites/core_plugins/index.js
index 9f29b2c8b7dbfe..73802a7e67df44 100644
--- a/test/plugin_functional/test_suites/core_plugins/index.js
+++ b/test/plugin_functional/test_suites/core_plugins/index.js
@@ -19,6 +19,7 @@
 
 export default function ({ loadTestFile }) {
   describe('core plugins', () => {
+    loadTestFile(require.resolve('./applications'));
     loadTestFile(require.resolve('./ui_plugins'));
     loadTestFile(require.resolve('./server_plugins.js'));
   });

From d77549ba97391b46b291fb40a8ffdf83b483625d Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 19 Aug 2019 11:01:01 -0500
Subject: [PATCH 06/14] Fix PR comments

---
 ...c.applicationsetup.registermountcontext.md |  2 +-
 ...c.applicationstart.registermountcontext.md |  2 +-
 ...bana-plugin-public.appmountcontextnames.md | 12 ---
 .../core/public/kibana-plugin-public.md       |  1 -
 src/core/public/application/index.ts          |  1 -
 .../router.test.tsx}                          |  3 +-
 src/core/public/application/types.ts          | 11 +--
 src/core/public/application/ui/index.ts       |  1 +
 src/core/public/index.ts                      |  9 +--
 src/core/public/public.api.md                 |  7 +-
 .../rendering/rendering_service.test.tsx      | 78 ++++++++++++-------
 src/legacy/ui/ui_render/ui_render_mixin.js    |  2 +-
 src/legacy/ui/ui_render/views/ui_app.pug      |  2 +-
 .../core_plugin_a/public/application.tsx      | 10 +--
 .../core_plugin_b/public/application.tsx      | 12 +--
 .../test_suites/core_plugins/applications.js  | 36 ++++++---
 16 files changed, 99 insertions(+), 90 deletions(-)
 delete mode 100644 docs/development/core/public/kibana-plugin-public.appmountcontextnames.md
 rename src/core/public/application/{ui/ui_integration.test.tsx => integration_tests/router.test.tsx} (97%)

diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
index 7c32e63efe7de6..0b5bd8eeb36eca 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.registermountcontext.md
@@ -9,7 +9,7 @@ Register a context provider for application mounting. Will only be available to
 <b>Signature:</b>
 
 ```typescript
-registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 ```
 
 ## Parameters
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md b/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
index 9042bf2accd2b3..fc86aaf658b681 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.registermountcontext.md
@@ -9,7 +9,7 @@ Register a context provider for application mounting. Will only be available to
 <b>Signature:</b>
 
 ```typescript
-registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 ```
 
 ## Parameters
diff --git a/docs/development/core/public/kibana-plugin-public.appmountcontextnames.md b/docs/development/core/public/kibana-plugin-public.appmountcontextnames.md
deleted file mode 100644
index fa83ebc86d6c16..00000000000000
--- a/docs/development/core/public/kibana-plugin-public.appmountcontextnames.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [AppMountContextNames](./kibana-plugin-public.appmountcontextnames.md)
-
-## AppMountContextNames type
-
-
-<b>Signature:</b>
-
-```typescript
-export declare type AppMountContextNames = keyof AppMountContext;
-```
diff --git a/docs/development/core/public/kibana-plugin-public.md b/docs/development/core/public/kibana-plugin-public.md
index 3adccbf10c432b..ccabdc62c5e7a2 100644
--- a/docs/development/core/public/kibana-plugin-public.md
+++ b/docs/development/core/public/kibana-plugin-public.md
@@ -86,7 +86,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Type Alias | Description |
 |  --- | --- |
-|  [AppMountContextNames](./kibana-plugin-public.appmountcontextnames.md) |  |
 |  [AppUnmount](./kibana-plugin-public.appunmount.md) | A function called when an application should be unmounted from the page. This function should be synchronous. |
 |  [ChromeHelpExtension](./kibana-plugin-public.chromehelpextension.md) |  |
 |  [ChromeNavLinkUpdateableFields](./kibana-plugin-public.chromenavlinkupdateablefields.md) |  |
diff --git a/src/core/public/application/index.ts b/src/core/public/application/index.ts
index 7a4c6df5284bf5..ae25b54cf07a84 100644
--- a/src/core/public/application/index.ts
+++ b/src/core/public/application/index.ts
@@ -24,7 +24,6 @@ export {
   AppBase,
   AppUnmount,
   AppMountContext,
-  AppMountContextNames,
   AppMountParameters,
   ApplicationSetup,
   ApplicationStart,
diff --git a/src/core/public/application/ui/ui_integration.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
similarity index 97%
rename from src/core/public/application/ui/ui_integration.test.tsx
rename to src/core/public/application/integration_tests/router.test.tsx
index d8cd9c616c8f1f..08b20bb9459849 100644
--- a/src/core/public/application/ui/ui_integration.test.tsx
+++ b/src/core/public/application/integration_tests/router.test.tsx
@@ -27,8 +27,7 @@ import { I18nProvider } from '@kbn/i18n/react';
 
 import { AppMounter, LegacyApp, AppMountParameters } from '../types';
 import { httpServiceMock } from '../../http/http_service.mock';
-import { AppRouter } from './app_router';
-import { AppNotFound } from './app_not_found_screen';
+import { AppRouter, AppNotFound } from '../ui';
 
 const createMountHandler = (htmlString: string) =>
   jest.fn(async ({ appBasePath: basename, element: el }: AppMountParameters) => {
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index ac0b8504d26756..0c5f6d3ad3cbbc 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -117,9 +117,6 @@ export interface AppMountContext {
   };
 }
 
-/** @public */
-export type AppMountContextNames = keyof AppMountContext;
-
 /** @public */
 export interface AppMountParameters {
   /**
@@ -194,7 +191,7 @@ export interface ApplicationSetup {
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends AppMountContextNames>(
+  registerMountContext<T extends keyof AppMountContext>(
     contextName: T,
     provider: IContextProvider<AppMountContext, T>
   ): void;
@@ -224,7 +221,7 @@ export interface InternalApplicationSetup {
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends AppMountContextNames>(
+  registerMountContext<T extends keyof AppMountContext>(
     pluginOpaqueId: PluginOpaqueId,
     contextName: T,
     provider: IContextProvider<AppMountContext, T>
@@ -255,7 +252,7 @@ export interface ApplicationStart {
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends AppMountContextNames>(
+  registerMountContext<T extends keyof AppMountContext>(
     contextName: T,
     provider: IContextProvider<AppMountContext, T>
   ): void;
@@ -284,7 +281,7 @@ export interface InternalApplicationStart
    * @param contextName - The key of {@link AppMountContext} this provider's return value should be attached to.
    * @param provider - A {@link IContextProvider} function
    */
-  registerMountContext<T extends AppMountContextNames>(
+  registerMountContext<T extends keyof AppMountContext>(
     pluginOpaqueId: PluginOpaqueId,
     contextName: T,
     provider: IContextProvider<AppMountContext, T>
diff --git a/src/core/public/application/ui/index.ts b/src/core/public/application/ui/index.ts
index 65d04bab5fa03d..7fa778740d3b41 100644
--- a/src/core/public/application/ui/index.ts
+++ b/src/core/public/application/ui/index.ts
@@ -18,3 +18,4 @@
  */
 
 export { AppRouter } from './app_router';
+export { AppNotFound } from './app_not_found_screen';
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index ee97e337928aa6..353d87b640b4f1 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -72,14 +72,7 @@ import { IContextContainer, IContextProvider, ContextSetup, IContextHandler } fr
 export { CoreContext, CoreSystem } from './core_system';
 export { RecursiveReadonly } from '../utils';
 
-export {
-  App,
-  AppBase,
-  AppUnmount,
-  AppMountContext,
-  AppMountContextNames,
-  AppMountParameters,
-} from './application';
+export { App, AppBase, AppUnmount, AppMountContext, AppMountParameters } from './application';
 
 export {
   SavedObjectsBatchResponse,
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 0f01a91da94cb8..81279729316587 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -30,7 +30,7 @@ export interface AppBase {
 // @public (undocumented)
 export interface ApplicationSetup {
     register(app: App): void;
-    registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+    registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 }
 
 // @public (undocumented)
@@ -40,7 +40,7 @@ export interface ApplicationStart {
         path?: string;
         state?: any;
     }): void;
-    registerMountContext<T extends AppMountContextNames>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
+    registerMountContext<T extends keyof AppMountContext>(contextName: T, provider: IContextProvider<AppMountContext, T>): void;
 }
 
 // @public
@@ -57,9 +57,6 @@ export interface AppMountContext {
     };
 }
 
-// @public (undocumented)
-export type AppMountContextNames = keyof AppMountContext;
-
 // @public (undocumented)
 export interface AppMountParameters {
     appBasePath: string;
diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx
index 4d6e7daa7b4ef0..3b9bf01e43076f 100644
--- a/src/core/public/rendering/rendering_service.test.tsx
+++ b/src/core/public/rendering/rendering_service.test.tsx
@@ -25,7 +25,7 @@ import { InternalApplicationStart } from '../application';
 import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
 
 describe('RenderingService#start', () => {
-  const getService = () => {
+  const getService = ({ legacyMode = false }: { legacyMode?: boolean } = {}) => {
     const rendering = new RenderingService();
     const application = {
       getComponent: () => <div>Hello application!</div>,
@@ -33,40 +33,62 @@ describe('RenderingService#start', () => {
     const chrome = chromeServiceMock.createStartContract();
     chrome.getHeaderComponent.mockReturnValue(<div>Hello chrome!</div>);
     const injectedMetadata = injectedMetadataServiceMock.createStartContract();
+    injectedMetadata.getLegacyMode.mockReturnValue(legacyMode);
     const targetDomElement = document.createElement('div');
     const start = rendering.start({ application, chrome, injectedMetadata, targetDomElement });
     return { start, targetDomElement };
   };
 
-  it('renders into provided DOM element', () => {
+  it('renders application service into provided DOM element', () => {
     const { targetDomElement } = getService();
-    expect(targetDomElement).toMatchInlineSnapshot(`
-<div>
-  <div
-    class="content"
-    data-test-subj="kibanaChrome"
-  >
-    <div>
-      Hello chrome!
-    </div>
-    <div />
-  </div>
-</div>
-`);
+    expect(targetDomElement.querySelector('div.application')).toMatchInlineSnapshot(`
+      <div
+        class="application"
+      >
+        <div>
+          Hello application!
+        </div>
+      </div>
+    `);
   });
 
-  it('returns a div for the legacy service to render into', () => {
-    const {
-      start: { legacyTargetDomElement },
-      targetDomElement,
-    } = getService();
-    legacyTargetDomElement!.innerHTML = '<span id="legacy">Hello legacy!</span>';
-    expect(targetDomElement.querySelector('#legacy')).toMatchInlineSnapshot(`
-<span
-  id="legacy"
->
-  Hello legacy!
-</span>
-`);
+  it('contains wrapper divs', () => {
+    const { targetDomElement } = getService();
+    expect(targetDomElement.querySelector('div.app-wrapper')).toBeDefined();
+    expect(targetDomElement.querySelector('div.app-wrapper-pannel')).toBeDefined();
+  });
+
+  describe('legacyMode', () => {
+    it('renders into provided DOM element', () => {
+      const { targetDomElement } = getService({ legacyMode: true });
+      expect(targetDomElement).toMatchInlineSnapshot(`
+          <div>
+            <div
+              class="content"
+              data-test-subj="kibanaChrome"
+            >
+              <div>
+                Hello chrome!
+              </div>
+              <div />
+            </div>
+          </div>
+      `);
+    });
+
+    it('returns a div for the legacy service to render into', () => {
+      const {
+        start: { legacyTargetDomElement },
+        targetDomElement,
+      } = getService({ legacyMode: true });
+      legacyTargetDomElement!.innerHTML = '<span id="legacy">Hello legacy!</span>';
+      expect(targetDomElement.querySelector('#legacy')).toMatchInlineSnapshot(`
+          <span
+            id="legacy"
+          >
+            Hello legacy!
+          </span>
+      `);
+    });
   });
 });
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index 1e91c4ca2c9049..7e6609c4b5487e 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -164,7 +164,7 @@ export function uiRenderMixin(kbnServer, server, config) {
   });
 
   server.route({
-    path: '/app/{id}/{path?}',
+    path: '/app/{id}/{any*}',
     method: 'GET',
     async handler(req, h) {
       const id = req.params.id;
diff --git a/src/legacy/ui/ui_render/views/ui_app.pug b/src/legacy/ui/ui_render/views/ui_app.pug
index 5bbcc51e7745c1..95b321e09b5002 100644
--- a/src/legacy/ui/ui_render/views/ui_app.pug
+++ b/src/legacy/ui/ui_render/views/ui_app.pug
@@ -114,7 +114,7 @@ block content
       }
     }
 
-  .kibanaWelcomeView(id="kbn_loading_message", style="display: none;")
+  .kibanaWelcomeView(id="kbn_loading_message", style="display: none;", data-test-subj="kbnLoadingMessage")
     .kibanaLoaderWrap
       .kibanaLoader
       .kibanaWelcomeLogoCircle
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
index de82037cc1a49a..5d464cf0405d04 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/application.tsx
@@ -38,7 +38,7 @@ import {
 import { AppMountContext, AppMountParameters } from 'kibana/public';
 
 const Home = () => (
-  <EuiPageBody data-test-subj="foo-app-home">
+  <EuiPageBody data-test-subj="fooAppHome">
     <EuiPageHeader>
       <EuiPageHeaderSection>
         <EuiTitle size="l">
@@ -60,7 +60,7 @@ const Home = () => (
 );
 
 const PageA = () => (
-  <EuiPageBody data-test-subj="foo-app-page-a">
+  <EuiPageBody data-test-subj="fooAppPageA">
     <EuiPageHeader>
       <EuiPageHeaderSection>
         <EuiTitle size="l">
@@ -95,19 +95,19 @@ const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
             id: 'home',
             name: 'Home',
             onClick: () => history.push('/'),
-            'data-test-subj': 'foo-nav-home',
+            'data-test-subj': 'fooNavHome',
           },
           {
             id: 'page-a',
             name: 'Page A',
             onClick: () => history.push('/page-a'),
-            'data-test-subj': 'foo-nav-page-a',
+            'data-test-subj': 'fooNavPageA',
           },
           {
             id: 'linktobar',
             name: 'Open Bar / Page B',
             onClick: () => navigateToApp('bar', { path: 'page-b?query=here', state: 'foo!!' }),
-            'data-test-subj': 'foo-nav-bar-page-b',
+            'data-test-subj': 'fooNavBarPageB',
           },
         ],
       },
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
index cba7de40a4d4b9..d5fa14089cdf55 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/application.tsx
@@ -38,7 +38,7 @@ import {
 import { AppMountContext, AppMountParameters } from 'kibana/public';
 
 const Home = () => (
-  <EuiPageBody data-test-subj="bar-app-home">
+  <EuiPageBody data-test-subj="barAppHome">
     <EuiPageHeader>
       <EuiPageHeaderSection>
         <EuiTitle size="l">
@@ -64,7 +64,7 @@ const PageB = ({ location }: RouteComponentProps) => {
   new URLSearchParams(location.search).forEach((value, key) => searchParams.push([key, value]));
 
   return (
-    <EuiPageBody data-test-subj="bar-app-page-b">
+    <EuiPageBody data-test-subj="barAppPageB">
       <EuiPageHeader>
         <EuiPageHeaderSection>
           <EuiTitle size="l">
@@ -78,7 +78,7 @@ const PageB = ({ location }: RouteComponentProps) => {
             <EuiTitle>
               <h2>
                 Search params:{' '}
-                <span data-test-subj="bar-app-page-b-query">{JSON.stringify(searchParams)}</span>
+                <span data-test-subj="barAppPageBQuery">{JSON.stringify(searchParams)}</span>
               </h2>
             </EuiTitle>
           </EuiPageContentHeaderSection>
@@ -102,19 +102,19 @@ const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
             id: 'home',
             name: 'Home',
             onClick: () => navigateToApp('bar', { path: '/' }),
-            'data-test-subj': 'bar-nav-home',
+            'data-test-subj': 'barNavHome',
           },
           {
             id: 'page-b',
             name: 'Page B',
             onClick: () => history.push('/page-b', { bar: 'page-b' }),
-            'data-test-subj': 'bar-nav-page-b',
+            'data-test-subj': 'barNavPageB',
           },
           {
             id: 'linktofoo',
             name: 'Open Foo',
             onClick: () => navigateToApp('foo'),
-            'data-test-subj': 'bar-nav-foo-home',
+            'data-test-subj': 'barNavFooHome',
           },
         ],
       },
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.js b/test/plugin_functional/test_suites/core_plugins/applications.js
index c11dc2b35adbb6..37bb2276b4a839 100644
--- a/test/plugin_functional/test_suites/core_plugins/applications.js
+++ b/test/plugin_functional/test_suites/core_plugins/applications.js
@@ -26,57 +26,71 @@ export default function ({ getService, getPageObjects }) {
   const appsMenu = getService('appsMenu');
   const testSubjects = getService('testSubjects');
 
+  const loadingScreenNotShown = async () =>
+    expect(await testSubjects.exists('kbnLoadingMessage')).to.be(false);
+
+  const loadingScreenShown = () =>
+    testSubjects.existOrFail('kbnLoadingMessage');
+
   describe('ui applications', function describeIndexTests() {
     before(async () => {
       await PageObjects.common.navigateToApp('foo');
     });
 
     it('starts on home page', async () => {
-      await testSubjects.existOrFail('foo-app-home');
+      await testSubjects.existOrFail('fooAppHome');
     });
 
     it('navigates to its own pages', async () => {
       // Go to page A
-      await testSubjects.click('foo-nav-page-a');
+      await testSubjects.click('fooNavPageA');
       expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/page-a`);
-      await testSubjects.existOrFail('foo-app-page-a');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppPageA');
+
       // Go to home page
-      await testSubjects.click('foo-nav-home');
+      await testSubjects.click('fooNavHome');
       expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/`);
-      await testSubjects.existOrFail('foo-app-home');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppHome');
     });
 
     it('can use the back button to navigate within an app', async () => {
       await browser.goBack();
       expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/page-a`);
-      await testSubjects.existOrFail('foo-app-page-a');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppPageA');
     });
 
     it('navigates to other apps', async () => {
-      await testSubjects.click('foo-nav-bar-page-b');
-      await testSubjects.existOrFail('bar-app-page-b');
+      await testSubjects.click('fooNavBarPageB');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('barAppPageB');
       expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/bar/page-b?query=here`);
     });
 
     it('preserves query parameters across apps', async () => {
-      const querySpan = await testSubjects.find('bar-app-page-b-query');
+      const querySpan = await testSubjects.find('barAppPageBQuery');
       expect(await querySpan.getVisibleText()).to.eql(`[["query","here"]]`);
     });
 
     it('can use the back button to navigate back to previous app', async () => {
       await browser.goBack();
       expect(await browser.getCurrentUrl()).to.eql(`http://localhost:5620/app/foo/page-a`);
-      await testSubjects.existOrFail('foo-app-page-a');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('fooAppPageA');
     });
 
     it('can navigate from NP apps to legacy apps', async () => {
       await appsMenu.clickLink('Management');
+      await loadingScreenShown();
       await testSubjects.existOrFail('managementNav');
     });
 
     it('can navigate from legacy apps to NP apps', async () => {
       await appsMenu.clickLink('Foo');
-      await testSubjects.existOrFail('foo-app-home');
+      await loadingScreenShown();
+      await testSubjects.existOrFail('fooAppHome');
     });
   });
 }

From 4af7837acaae57311821be3c1df3aa24239188b4 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Fri, 23 Aug 2019 15:20:28 -0500
Subject: [PATCH 07/14] Fix PR comments

---
 src/core/public/application/application_service.tsx    | 10 +++-------
 .../application/capabilities/capabilities_service.tsx  |  4 ++--
 src/core/public/application/types.ts                   |  4 ++--
 src/core/public/application/ui/app_container.tsx       |  2 +-
 src/core/public/chrome/nav_links/nav_links_service.ts  |  4 ++--
 src/dev/jest/config.integration.js                     |  1 +
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 5f33a9253c5131..d7775d61e1cfbb 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -134,13 +134,9 @@ export class ApplicationService {
       currentAppId$,
 
       navigateToApp: (appId, { path, state }: { path?: string; state?: any } = {}) => {
-        let appPath: string;
-        if (path) {
-          const pathWithoutPrecedingSlash = path.replace(/^\//, '');
-          appPath = `/app/${appId}/${pathWithoutPrecedingSlash}`;
-        } else {
-          appPath = `/app/${appId}`;
-        }
+        const appPath = path
+          ? `/app/${appId}/${path.replace(/^\//, '')}` // Remove preceding slash from path if present
+          : `/app/${appId}`;
 
         if (legacyMode) {
           // If we're in legacy mode, do a full page refresh to load the NP app.
diff --git a/src/core/public/application/capabilities/capabilities_service.tsx b/src/core/public/application/capabilities/capabilities_service.tsx
index b5be7b9304c89d..b080f8c138cf28 100644
--- a/src/core/public/application/capabilities/capabilities_service.tsx
+++ b/src/core/public/application/capabilities/capabilities_service.tsx
@@ -69,14 +69,14 @@ export class CapabilitiesService {
   }: StartDeps): Promise<CapabilitiesStart> {
     const capabilities = deepFreeze(injectedMetadata.getCapabilities());
     const availableApps = new Map(
-      [...apps.entries()].filter(
+      [...apps].filter(
         ([appId]) =>
           capabilities.navLinks[appId] === undefined || capabilities.navLinks[appId] === true
       )
     );
 
     const availableLegacyApps = new Map(
-      [...legacyApps.entries()].filter(
+      [...legacyApps].filter(
         ([appId]) =>
           capabilities.navLinks[appId] === undefined || capabilities.navLinks[appId] === true
       )
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 0c5f6d3ad3cbbc..cbca4ecb08491c 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -74,7 +74,7 @@ export interface AppBase {
  */
 export interface App extends AppBase {
   /**
-   * A mount function called when the user navigates to this app's `rootRoute`.
+   * A mount function called when the user navigates to this app's route.
    * @param context The mount context for this app.
    * @param targetDomElement An HTMLElement to mount the application onto.
    * @returns An unmounting function that will be called to unmount the application.
@@ -138,7 +138,7 @@ export interface AppMountParameters {
    *     application.register({
    *     id: 'my-app',
    *     async mount(context, params) {
-   *       const { renderApp } = await import('./applcation');
+   *       const { renderApp } = await import('./application');
    *       return renderApp(context, params);
    *     },
    *   });
diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
index 641a08f57aeca1..d4313cec0e569a 100644
--- a/src/core/public/application/ui/app_container.tsx
+++ b/src/core/public/application/ui/app_container.tsx
@@ -67,7 +67,7 @@ export class AppContainer extends React.Component<Props, State> {
 
   async mountApp() {
     const { apps, legacyApps, match, basePath, currentAppId$, redirectTo } = this.props;
-    const appId = match.params.appId;
+    const { appId } = match.params;
 
     const mount = apps.get(appId);
     if (mount) {
diff --git a/src/core/public/chrome/nav_links/nav_links_service.ts b/src/core/public/chrome/nav_links/nav_links_service.ts
index 5254012665eaf9..affc639faf0b85 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.ts
@@ -99,7 +99,7 @@ export class NavLinksService {
   private readonly stop$ = new ReplaySubject(1);
 
   public start({ application, http }: StartDeps): ChromeNavLinks {
-    const appLinks = [...application.availableApps.entries()].map(
+    const appLinks = [...application.availableApps].map(
       ([appId, app]) =>
         [
           appId,
@@ -111,7 +111,7 @@ export class NavLinksService {
         ] as [string, NavLinkWrapper]
     );
 
-    const legacyAppLinks = [...application.availableLegacyApps.entries()].map(
+    const legacyAppLinks = [...application.availableLegacyApps].map(
       ([appId, app]) =>
         [
           appId,
diff --git a/src/dev/jest/config.integration.js b/src/dev/jest/config.integration.js
index 8348b7594961f1..6ffa9ac3624302 100644
--- a/src/dev/jest/config.integration.js
+++ b/src/dev/jest/config.integration.js
@@ -24,6 +24,7 @@ export default {
   testMatch: [
     '**/integration_tests/**/*.test.js',
     '**/integration_tests/**/*.test.ts',
+    '**/integration_tests/**/*.test.tsx',
   ],
   testPathIgnorePatterns: config.testPathIgnorePatterns.filter(
     (pattern) => !pattern.includes('integration_tests')

From 37d2f71e24b0c20118f1e1044b1fa744e9825cfc Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 26 Aug 2019 09:16:06 -0500
Subject: [PATCH 08/14] Remove other usages of rootRoute

---
 docs/development/core/public/kibana-plugin-public.app.md      | 2 +-
 .../development/core/public/kibana-plugin-public.app.mount.md | 2 +-
 .../core/public/kibana-plugin-public.applicationsetup.md      | 2 +-
 .../public/kibana-plugin-public.applicationsetup.register.md  | 2 +-
 .../kibana-plugin-public.appmountparameters.appbasepath.md    | 2 +-
 src/core/public/application/types.ts                          | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/development/core/public/kibana-plugin-public.app.md b/docs/development/core/public/kibana-plugin-public.app.md
index 317d70e8045290..60cac357d1fe0c 100644
--- a/docs/development/core/public/kibana-plugin-public.app.md
+++ b/docs/development/core/public/kibana-plugin-public.app.md
@@ -16,5 +16,5 @@ export interface App extends AppBase
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [mount](./kibana-plugin-public.app.mount.md) | <code>(context: AppMountContext, params: AppMountParameters) =&gt; AppUnmount &#124; Promise&lt;AppUnmount&gt;</code> | A mount function called when the user navigates to this app's <code>rootRoute</code>. |
+|  [mount](./kibana-plugin-public.app.mount.md) | <code>(context: AppMountContext, params: AppMountParameters) =&gt; AppUnmount &#124; Promise&lt;AppUnmount&gt;</code> | A mount function called when the user navigates to this app's route. |
 
diff --git a/docs/development/core/public/kibana-plugin-public.app.mount.md b/docs/development/core/public/kibana-plugin-public.app.mount.md
index fc2debd50fff87..dda06b035db4a0 100644
--- a/docs/development/core/public/kibana-plugin-public.app.mount.md
+++ b/docs/development/core/public/kibana-plugin-public.app.mount.md
@@ -4,7 +4,7 @@
 
 ## App.mount property
 
-A mount function called when the user navigates to this app's `rootRoute`<!-- -->.
+A mount function called when the user navigates to this app's route.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.md
index d7ed7bad20ceaa..b53873bc0fb8ae 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.md
@@ -15,6 +15,6 @@ export interface ApplicationSetup
 
 |  Method | Description |
 |  --- | --- |
-|  [register(app)](./kibana-plugin-public.applicationsetup.register.md) | Register an mountable application to the system. Apps will be mounted based on their <code>rootRoute</code>. |
+|  [register(app)](./kibana-plugin-public.applicationsetup.register.md) | Register an mountable application to the system. |
 |  [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationsetup.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. |
 
diff --git a/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md b/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
index 50bcc28fd17135..b4ccb6a01c6001 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationsetup.register.md
@@ -4,7 +4,7 @@
 
 ## ApplicationSetup.register() method
 
-Register an mountable application to the system. Apps will be mounted based on their `rootRoute`<!-- -->.
+Register an mountable application to the system.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md b/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
index c8ddf12e7c318d..16c8ffe07fc155 100644
--- a/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
+++ b/docs/development/core/public/kibana-plugin-public.appmountparameters.appbasepath.md
@@ -23,7 +23,7 @@ export class MyPlugin implements Plugin {
     application.register({
     id: 'my-app',
     async mount(context, params) {
-      const { renderApp } = await import('./applcation');
+      const { renderApp } = await import('./application');
       return renderApp(context, params);
     },
   });
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index cbca4ecb08491c..b74c623fe03dbc 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -179,7 +179,7 @@ export type AppMounter = (params: AppMountParameters) => Promise<AppUnmount>;
 /** @public */
 export interface ApplicationSetup {
   /**
-   * Register an mountable application to the system. Apps will be mounted based on their `rootRoute`.
+   * Register an mountable application to the system.
    * @param app - an {@link App}
    */
   register(app: App): void;
@@ -200,7 +200,7 @@ export interface ApplicationSetup {
 /** @internal */
 export interface InternalApplicationSetup {
   /**
-   * Register an mountable application to the system. Apps will be mounted based on their `rootRoute`.
+   * Register an mountable application to the system.
    * @param plugin - opaque ID of the plugin that registers this application
    * @param app
    */

From e1178b31c7eaa66ce3cab54a0592cb90863945bc Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 26 Aug 2019 09:18:58 -0500
Subject: [PATCH 09/14] Use state field notation

---
 src/core/public/application/ui/app_container.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
index d4313cec0e569a..3db1164b0d79f6 100644
--- a/src/core/public/application/ui/app_container.tsx
+++ b/src/core/public/application/ui/app_container.tsx
@@ -45,10 +45,7 @@ export class AppContainer extends React.Component<Props, State> {
   private readonly containerDiv = React.createRef<HTMLDivElement>();
   private unmountFunc?: AppUnmount;
 
-  constructor(props: Props) {
-    super(props);
-    this.state = { appNotFound: false };
-  }
+  state: State = { appNotFound: false };
 
   componentDidMount() {
     this.mountApp();

From e69edde240e57cd71c12fab61cdfc1df66545e3c Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 27 Aug 2019 15:58:31 -0500
Subject: [PATCH 10/14] Add support for open in new tab

---
 .../application/application_service.tsx       | 17 ++++---
 src/core/public/application/types.ts          |  9 +++-
 src/core/public/chrome/chrome_service.tsx     |  3 +-
 src/core/public/chrome/ui/header/header.tsx   | 47 ++++++++++++++-----
 4 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index d7775d61e1cfbb..29711ecc859cf5 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -133,17 +133,17 @@ export class ApplicationService {
       registerMountContext: this.mountContext.registerContext,
       currentAppId$,
 
-      navigateToApp: (appId, { path, state }: { path?: string; state?: any } = {}) => {
-        const appPath = path
-          ? `/app/${appId}/${path.replace(/^\//, '')}` // Remove preceding slash from path if present
-          : `/app/${appId}`;
+      urlForApp: (appId, options: { path?: string } = {}) => {
+        return http.basePath.prepend(appPath(appId, options));
+      },
 
+      navigateToApp: (appId, { path, state }: { path?: string; state?: any } = {}) => {
         if (legacyMode) {
           // If we're in legacy mode, do a full page refresh to load the NP app.
-          redirectTo(http.basePath.prepend(appPath));
+          redirectTo(http.basePath.prepend(appPath(appId, { path })));
         } else {
           // basePath not needed here because `history` is configured with basename
-          history!.push(appPath, state);
+          history!.push(appPath(appId, { path }), state);
         }
       },
 
@@ -175,3 +175,8 @@ export class ApplicationService {
 
   public stop() {}
 }
+
+const appPath = (appId: string, { path }: { path?: string } = {}): string =>
+  path
+    ? `/app/${appId}/${path.replace(/^\//, '')}` // Remove preceding slash from path if present
+    : `/app/${appId}`;
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index b74c623fe03dbc..2bb95b610c894f 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -244,6 +244,13 @@ export interface ApplicationStart {
    */
   navigateToApp(appId: string, options?: { path?: string; state?: any }): void;
 
+  /**
+   * Returns a relative URL to a given app
+   * @param appId
+   * @param options.path - optional path inside application to deep link to
+   */
+  urlForApp(appId: string, options?: { path?: string }): string;
+
   /**
    * Register a context provider for application mounting. Will only be available to applications that depend on the
    * plugin that registered this context.
@@ -260,7 +267,7 @@ export interface ApplicationStart {
 
 /** @internal */
 export interface InternalApplicationStart
-  extends Pick<ApplicationStart, 'capabilities' | 'navigateToApp'> {
+  extends Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'urlForApp'> {
   /**
    * Apps available based on the current capabilities. Should be used
    * to show navigation links and make routing decisions.
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index 7bac6b57ca6e15..49eae3580c1c71 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -129,11 +129,11 @@ export class ChromeService {
           <LoadingIndicator loadingCount$={http.getLoadingCount$()} />
 
           <Header
+            application={application}
             appTitle$={appTitle$.pipe(takeUntil(this.stop$))}
             badge$={badge$.pipe(takeUntil(this.stop$))}
             basePath={http.basePath}
             breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
-            currentAppId$={application.currentAppId$}
             kibanaDocLink={docLinks.links.kibana}
             forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
             helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
@@ -145,7 +145,6 @@ export class ChromeService {
             kibanaVersion={injectedMetadata.getKibanaVersion()}
             legacyMode={injectedMetadata.getLegacyMode()}
             navLinks$={navLinks.getNavLinks$()}
-            navigateToApp={application.navigateToApp}
             recentlyAccessed$={recentlyAccessed.get$()}
             navControlsLeft$={navControls.getLeft$()}
             navControlsRight$={navControls.getRight$()}
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index d20c7e2cd3dc6e..038bb77f889612 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -65,6 +65,7 @@ import {
 } from '../..';
 import { HttpStart } from '../../../http';
 import { ChromeHelpExtension } from '../../chrome_service';
+import { ApplicationStart, InternalApplicationStart } from '../../../application/types';
 
 // Providing a buffer between the limit and the cut off index
 // protects from truncating just the last couple (6) characters
@@ -115,13 +116,24 @@ function extendRecentlyAccessedHistoryItem(
   };
 }
 
-function extendNavLink(navLink: ChromeNavLink) {
+function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['urlForApp']) {
+  if (navLink.legacy) {
+    return {
+      ...navLink,
+      href: navLink.url && !navLink.active ? navLink.url : navLink.baseUrl,
+    };
+  }
+
   return {
     ...navLink,
-    href: navLink.url && !navLink.active ? navLink.url : navLink.baseUrl,
+    href: urlForApp(navLink.id),
   };
 }
 
+function isModifiedEvent(event: MouseEvent) {
+  return !!(event.metaKey || event.altKey || event.ctrlKey || event.shiftKey);
+}
+
 function findClosestAnchor(element: HTMLElement): HTMLAnchorElement | void {
   let current = element;
   while (current) {
@@ -149,10 +161,10 @@ export type HeaderProps = Pick<Props, Exclude<keyof Props, 'intl'>>;
 
 interface Props {
   kibanaVersion: string;
+  application: InternalApplicationStart;
   appTitle$: Rx.Observable<string>;
   badge$: Rx.Observable<ChromeBadge | undefined>;
   breadcrumbs$: Rx.Observable<ChromeBreadcrumb[]>;
-  currentAppId$: Rx.Observable<string | undefined>;
   homeHref: string;
   isVisible$: Rx.Observable<boolean>;
   kibanaDocLink: string;
@@ -163,7 +175,6 @@ interface Props {
   legacyMode: boolean;
   navControlsLeft$: Rx.Observable<readonly ChromeNavControl[]>;
   navControlsRight$: Rx.Observable<readonly ChromeNavControl[]>;
-  navigateToApp: (appId: string) => void;
   intl: InjectedIntl;
   basePath: HttpStart['basePath'];
   isLocked?: boolean;
@@ -210,7 +221,7 @@ class HeaderUI extends Component<Props, State> {
       Rx.combineLatest(
         this.props.navControlsLeft$,
         this.props.navControlsRight$,
-        this.props.currentAppId$
+        this.props.application.currentAppId$
       )
     ).subscribe({
       next: ([
@@ -225,7 +236,9 @@ class HeaderUI extends Component<Props, State> {
           appTitle,
           isVisible,
           forceNavigation,
-          navLinks: navLinks.map(navLink => extendNavLink(navLink)),
+          navLinks: navLinks.map(navLink =>
+            extendNavLink(navLink, this.props.application.urlForApp)
+          ),
           recentlyAccessed: recentlyAccessed.map(ra =>
             extendRecentlyAccessedHistoryItem(navLinks, ra, this.props.basePath)
           ),
@@ -272,6 +285,7 @@ class HeaderUI extends Component<Props, State> {
 
   public render() {
     const {
+      application,
       badge$,
       basePath,
       breadcrumbs$,
@@ -282,7 +296,6 @@ class HeaderUI extends Component<Props, State> {
       kibanaVersion,
       onIsLockedUpdate,
       legacyMode,
-      navigateToApp,
     } = this.props;
     const {
       appTitle,
@@ -304,12 +317,20 @@ class HeaderUI extends Component<Props, State> {
         key: navLink.id,
         label: navLink.title,
 
-        // Legacy apps use href, NP apps use onClick
-        // This needs to work with both href and onClick to support "open in new tab" correctly, however EUI
-        // does not current support this.
-        // https://github.com/elastic/eui/pull/1933
-        href: legacyMode || navLink.legacy ? navLink.href : undefined,
-        onClick: !legacyMode && !navLink.legacy ? () => navigateToApp(navLink.id) : undefined,
+        // Use href and onClick to support "open in new tab" and SPA navigation in the same link
+        href: navLink.href,
+        onClick: (event: MouseEvent) => {
+          if (
+            !legacyMode && // ignore when in legacy mode
+            !navLink.legacy && // ignore links to legacy apps
+            !event.defaultPrevented && // onClick prevented default
+            event.button === 0 && // ignore everything but left clicks
+            !isModifiedEvent(event) // ignore clicks with modifier keys
+          ) {
+            event.preventDefault();
+            application.navigateToApp(navLink.id);
+          }
+        },
 
         // Legacy apps use `active` property, NP apps should match the current app
         isActive: navLink.active || currentAppId === navLink.id,

From 1af8620005bda3e467827f9064abceacad7280b9 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 28 Aug 2019 17:05:15 -0500
Subject: [PATCH 11/14] Fix PR comments

---
 package.json                                  |  2 +-
 .../application_service.test.tsx.snap         | 42 -------------------
 .../application/application_service.mock.ts   |  2 +
 .../application/application_service.test.tsx  |  2 +-
 .../application/application_service.tsx       |  2 +-
 .../integration_tests/router.test.tsx         |  2 +-
 src/core/public/application/types.ts          |  6 +--
 src/core/public/chrome/ui/header/header.tsx   |  4 +-
 src/core/public/http/http_service.mock.ts     |  8 ++--
 src/core/public/index.ts                      |  1 -
 src/core/public/legacy/legacy_service.ts      |  1 +
 src/core/public/plugins/plugin_context.ts     |  3 +-
 .../rendering/rendering_service.test.tsx      |  9 +---
 test/functional/page_objects/common_page.js   |  3 +-
 .../plugins/core_plugin_a/public/plugin.tsx   |  3 +-
 .../plugins/core_plugin_b/public/plugin.tsx   |  3 +-
 16 files changed, 23 insertions(+), 70 deletions(-)
 delete mode 100644 src/core/public/application/__snapshots__/application_service.test.tsx.snap

diff --git a/package.json b/package.json
index 2be8c80e50399f..4a2dd290eba501 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,6 @@
     "@kbn/pm": "1.0.0",
     "@kbn/test-subj-selector": "0.2.1",
     "@kbn/ui-framework": "1.0.0",
-    "@types/history": "^4.7.2",
     "@types/json-stable-stringify": "^1.0.32",
     "@types/lodash.clonedeep": "^4.5.4",
     "@types/react-grid-layout": "^0.16.7",
@@ -305,6 +304,7 @@
     "@types/hapi": "^17.0.18",
     "@types/hapi-auth-cookie": "^9.1.0",
     "@types/has-ansi": "^3.0.0",
+    "@types/history": "^4.7.2",
     "@types/hoek": "^4.1.3",
     "@types/humps": "^1.1.2",
     "@types/jest": "^24.0.9",
diff --git a/src/core/public/application/__snapshots__/application_service.test.tsx.snap b/src/core/public/application/__snapshots__/application_service.test.tsx.snap
deleted file mode 100644
index f2756df74cda51..00000000000000
--- a/src/core/public/application/__snapshots__/application_service.test.tsx.snap
+++ /dev/null
@@ -1,42 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`#start() returns renderable JSX tree 1`] = `
-<AppRouter
-  apps={Map {}}
-  basePath={
-    Object {
-      "get": [MockFunction] {
-        "calls": Array [
-          Array [],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": "",
-          },
-        ],
-      },
-      "prepend": [MockFunction],
-      "remove": [MockFunction],
-    }
-  }
-  currentAppId$={
-    BehaviorSubject {
-      "_isScalar": false,
-      "_value": undefined,
-      "closed": false,
-      "hasError": false,
-      "isStopped": false,
-      "observers": Array [],
-      "thrownError": null,
-    }
-  }
-  history={
-    Object {
-      "push": [MockFunction],
-    }
-  }
-  legacyApps={Map {}}
-  redirectTo={[Function]}
-/>
-`;
diff --git a/src/core/public/application/application_service.mock.ts b/src/core/public/application/application_service.mock.ts
index a0a8b5514882b5..a2db7552246362 100644
--- a/src/core/public/application/application_service.mock.ts
+++ b/src/core/public/application/application_service.mock.ts
@@ -44,6 +44,7 @@ const createInternalSetupContractMock = (): jest.Mocked<InternalApplicationSetup
 const createStartContractMock = (legacyMode = false): jest.Mocked<ApplicationStart> => ({
   capabilities: capabilitiesServiceMock.createStartContract().capabilities,
   navigateToApp: jest.fn(),
+  getUrlForApp: jest.fn(),
   registerMountContext: jest.fn(),
 });
 
@@ -52,6 +53,7 @@ const createInternalStartContractMock = (): jest.Mocked<InternalApplicationStart
   availableLegacyApps: new Map(),
   capabilities: capabilitiesServiceMock.createStartContract().capabilities,
   navigateToApp: jest.fn(),
+  getUrlForApp: jest.fn(),
   registerMountContext: jest.fn(),
   currentAppId$: new Subject<string | undefined>(),
   getComponent: jest.fn(),
diff --git a/src/core/public/application/application_service.test.tsx b/src/core/public/application/application_service.test.tsx
index cffac8cb27df22..5b374218a59324 100644
--- a/src/core/public/application/application_service.test.tsx
+++ b/src/core/public/application/application_service.test.tsx
@@ -167,7 +167,7 @@ describe('#start()', () => {
     injectedMetadata.getLegacyMode.mockReturnValue(false);
     const start = await service.start({ http, injectedMetadata });
 
-    expect(shallow(React.createElement(() => start.getComponent()))).toMatchSnapshot();
+    expect(() => shallow(React.createElement(() => start.getComponent()))).not.toThrow();
   });
 
   describe('navigateToApp', () => {
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index 29711ecc859cf5..d1855a0370f002 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -133,7 +133,7 @@ export class ApplicationService {
       registerMountContext: this.mountContext.registerContext,
       currentAppId$,
 
-      urlForApp: (appId, options: { path?: string } = {}) => {
+      getUrlForApp: (appId, options: { path?: string } = {}) => {
         return http.basePath.prepend(appPath(appId, options));
       },
 
diff --git a/src/core/public/application/integration_tests/router.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
index 08b20bb9459849..e6a1070e1a6847 100644
--- a/src/core/public/application/integration_tests/router.test.tsx
+++ b/src/core/public/application/integration_tests/router.test.tsx
@@ -68,7 +68,7 @@ describe('AppContainer', () => {
     history = createMemoryHistory();
     currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
     // Use 'asdf' as the basepath
-    const http = httpServiceMock.createStartContract('/asdf');
+    const http = httpServiceMock.createStartContract({ basePath: '/asdf' });
     router = mount(
       <I18nProvider>
         <AppRouter
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 2bb95b610c894f..018d7569ce411b 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -245,11 +245,11 @@ export interface ApplicationStart {
   navigateToApp(appId: string, options?: { path?: string; state?: any }): void;
 
   /**
-   * Returns a relative URL to a given app
+   * Returns a relative URL to a given app, including the global base path.
    * @param appId
    * @param options.path - optional path inside application to deep link to
    */
-  urlForApp(appId: string, options?: { path?: string }): string;
+  getUrlForApp(appId: string, options?: { path?: string }): string;
 
   /**
    * Register a context provider for application mounting. Will only be available to applications that depend on the
@@ -267,7 +267,7 @@ export interface ApplicationStart {
 
 /** @internal */
 export interface InternalApplicationStart
-  extends Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'urlForApp'> {
+  extends Pick<ApplicationStart, 'capabilities' | 'navigateToApp' | 'getUrlForApp'> {
   /**
    * Apps available based on the current capabilities. Should be used
    * to show navigation links and make routing decisions.
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 038bb77f889612..afd9f8e4a38209 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -116,7 +116,7 @@ function extendRecentlyAccessedHistoryItem(
   };
 }
 
-function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['urlForApp']) {
+function extendNavLink(navLink: ChromeNavLink, urlForApp: ApplicationStart['getUrlForApp']) {
   if (navLink.legacy) {
     return {
       ...navLink,
@@ -237,7 +237,7 @@ class HeaderUI extends Component<Props, State> {
           isVisible,
           forceNavigation,
           navLinks: navLinks.map(navLink =>
-            extendNavLink(navLink, this.props.application.urlForApp)
+            extendNavLink(navLink, this.props.application.getUrlForApp)
           ),
           recentlyAccessed: recentlyAccessed.map(ra =>
             extendRecentlyAccessedHistoryItem(navLinks, ra, this.props.basePath)
diff --git a/src/core/public/http/http_service.mock.ts b/src/core/public/http/http_service.mock.ts
index 628e84267ccb40..a94543414acfaa 100644
--- a/src/core/public/http/http_service.mock.ts
+++ b/src/core/public/http/http_service.mock.ts
@@ -25,7 +25,7 @@ type ServiceSetupMockType = jest.Mocked<HttpSetup> & {
   basePath: jest.Mocked<HttpSetup['basePath']>;
 };
 
-const createServiceMock = (basePath = ''): ServiceSetupMockType => ({
+const createServiceMock = ({ basePath = '' } = {}): ServiceSetupMockType => ({
   fetch: jest.fn(),
   get: jest.fn(),
   head: jest.fn(),
@@ -46,14 +46,14 @@ const createServiceMock = (basePath = ''): ServiceSetupMockType => ({
   removeAllInterceptors: jest.fn(),
 });
 
-const createMock = (basePath = '') => {
+const createMock = ({ basePath = '' } = {}) => {
   const mocked: jest.Mocked<Required<HttpService>> = {
     setup: jest.fn(),
     start: jest.fn(),
     stop: jest.fn(),
   };
-  mocked.setup.mockReturnValue(createServiceMock(basePath));
-  mocked.start.mockReturnValue(createServiceMock(basePath));
+  mocked.setup.mockReturnValue(createServiceMock({ basePath }));
+  mocked.start.mockReturnValue(createServiceMock({ basePath }));
   return mocked;
 };
 
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 353d87b640b4f1..89c309d8427d76 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -171,7 +171,6 @@ export interface CoreStart {
  * @public
  * @deprecated
  */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface LegacyCoreSetup extends CoreSetup {
   /** @deprecated */
   injectedMetadata: InjectedMetadataSetup;
diff --git a/src/core/public/legacy/legacy_service.ts b/src/core/public/legacy/legacy_service.ts
index 6abc195a77b4bc..ba93cd7b6b5a71 100644
--- a/src/core/public/legacy/legacy_service.ts
+++ b/src/core/public/legacy/legacy_service.ts
@@ -112,6 +112,7 @@ export class LegacyPlatformService {
       ...core,
       application: {
         capabilities: core.application.capabilities,
+        getUrlForApp: core.application.getUrlForApp,
         navigateToApp: core.application.navigateToApp,
         registerMountContext: notSupported(`core.application.registerMountContext()`),
       },
diff --git a/src/core/public/plugins/plugin_context.ts b/src/core/public/plugins/plugin_context.ts
index fc39537513b6c3..f4e25d27447bc2 100644
--- a/src/core/public/plugins/plugin_context.ts
+++ b/src/core/public/plugins/plugin_context.ts
@@ -81,7 +81,7 @@ export function createPluginSetupContext<
       registerMountContext: (contextName, provider) =>
         deps.application.registerMountContext(plugin.opaqueId, contextName, provider),
     },
-    context: omit(deps.context, 'setCurrentPlugin'),
+    context: deps.context,
     fatalErrors: deps.fatalErrors,
     http: deps.http,
     notifications: deps.notifications,
@@ -113,6 +113,7 @@ export function createPluginStartContext<
     application: {
       capabilities: deps.application.capabilities,
       navigateToApp: deps.application.navigateToApp,
+      getUrlForApp: deps.application.getUrlForApp,
       registerMountContext: (contextName, provider) =>
         deps.application.registerMountContext(plugin.opaqueId, contextName, provider),
     },
diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx
index 3b9bf01e43076f..9a4b46c657f081 100644
--- a/src/core/public/rendering/rendering_service.test.tsx
+++ b/src/core/public/rendering/rendering_service.test.tsx
@@ -81,14 +81,7 @@ describe('RenderingService#start', () => {
         start: { legacyTargetDomElement },
         targetDomElement,
       } = getService({ legacyMode: true });
-      legacyTargetDomElement!.innerHTML = '<span id="legacy">Hello legacy!</span>';
-      expect(targetDomElement.querySelector('#legacy')).toMatchInlineSnapshot(`
-          <span
-            id="legacy"
-          >
-            Hello legacy!
-          </span>
-      `);
+      expect(targetDomElement.contains(legacyTargetDomElement!)).toBe(true);
     });
   });
 });
diff --git a/test/functional/page_objects/common_page.js b/test/functional/page_objects/common_page.js
index bd483105373a88..5e17a4042e5579 100644
--- a/test/functional/page_objects/common_page.js
+++ b/test/functional/page_objects/common_page.js
@@ -162,7 +162,8 @@ export function CommonPageProvider({ getService, getPageObjects }) {
         });
       } else {
         appUrl = getUrl.noAuth(config.get('servers.kibana'), {
-          pathname: `${basePath}/app/${appName}`
+          pathname: `${basePath}/app/${appName}`,
+          hash
         });
       }
 
diff --git a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
index be73ae28792db0..5a7637828d9b72 100644
--- a/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_a/public/plugin.tsx
@@ -18,7 +18,6 @@
  */
 
 import { Plugin, CoreSetup } from 'kibana/public';
-import { renderApp } from './application';
 
 export class CorePluginAPlugin implements Plugin<CorePluginAPluginSetup, CorePluginAPluginStart> {
   public setup(core: CoreSetup, deps: {}) {
@@ -26,7 +25,7 @@ export class CorePluginAPlugin implements Plugin<CorePluginAPluginSetup, CorePlu
       id: 'foo',
       title: 'Foo',
       async mount(context, params) {
-        // Once dynamic imports are supported, replace with `await import()`
+        const { renderApp } = await import('./application');
         return renderApp(context, params);
       },
     });
diff --git a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
index 9683f99153baa1..f9285fbe4eaaf2 100644
--- a/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_plugin_b/public/plugin.tsx
@@ -19,7 +19,6 @@
 
 import { Plugin, CoreSetup } from 'kibana/public';
 import { CorePluginAPluginSetup } from '../../core_plugin_a/public/plugin';
-import { renderApp } from './application';
 
 declare global {
   interface Window {
@@ -40,7 +39,7 @@ export class CorePluginBPlugin
       id: 'bar',
       title: 'Bar',
       async mount(context, params) {
-        // Once dynamic imports are supported, replace with `await import()`
+        const { renderApp } = await import('./application');
         return renderApp(context, params);
       },
     });

From f6c5bb29798f1eeb41c8feeb7a62bd56d050d6a9 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Thu, 29 Aug 2019 18:01:57 -0500
Subject: [PATCH 12/14] Fix pesky await from the dead

---
 renovate.json5                                   | 16 ++++++++--------
 src/core/public/application/ui/app_container.tsx |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/renovate.json5 b/renovate.json5
index 642d9290852f57..75b044252c83de 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -241,14 +241,6 @@
           '(\\b|_)storybook(\\b|_)',
         ],
       },
-      {
-        groupSlug: 'history',
-        groupName: 'history related packages',
-        packageNames: [
-          'history',
-          '@types/history',
-        ],
-      },
       {
         groupSlug: 'json-stable-stringify',
         groupName: 'json-stable-stringify related packages',
@@ -377,6 +369,14 @@
           '@types/has-ansi',
         ],
       },
+      {
+        groupSlug: 'history',
+        groupName: 'history related packages',
+        packageNames: [
+          'history',
+          '@types/history',
+        ],
+      },
       {
         groupSlug: 'humps',
         groupName: 'humps related packages',
diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
index 3db1164b0d79f6..876cd3aa3a3d3a 100644
--- a/src/core/public/application/ui/app_container.tsx
+++ b/src/core/public/application/ui/app_container.tsx
@@ -90,7 +90,7 @@ export class AppContainer extends React.Component<Props, State> {
 
   async unmountApp() {
     if (this.unmountFunc) {
-      await this.unmountFunc();
+      this.unmountFunc();
       this.unmountFunc = undefined;
     }
   }

From 951ba7252ed966684f8d82fded57c270376dcd7f Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 3 Sep 2019 09:41:18 -0500
Subject: [PATCH 13/14] Update docs

---
 ...in-public.applicationstart.geturlforapp.md | 27 +++++++++++++++++++
 .../kibana-plugin-public.applicationstart.md  |  1 +
 src/core/public/public.api.md                 |  3 +++
 3 files changed, 31 insertions(+)
 create mode 100644 docs/development/core/public/kibana-plugin-public.applicationstart.geturlforapp.md

diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.geturlforapp.md b/docs/development/core/public/kibana-plugin-public.applicationstart.geturlforapp.md
new file mode 100644
index 00000000000000..422fbdf7418c23
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.geturlforapp.md
@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [ApplicationStart](./kibana-plugin-public.applicationstart.md) &gt; [getUrlForApp](./kibana-plugin-public.applicationstart.geturlforapp.md)
+
+## ApplicationStart.getUrlForApp() method
+
+Returns a relative URL to a given app, including the global base path.
+
+<b>Signature:</b>
+
+```typescript
+getUrlForApp(appId: string, options?: {
+        path?: string;
+    }): string;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  appId | <code>string</code> |  |
+|  options | <code>{</code><br/><code>        path?: string;</code><br/><code>    }</code> |  |
+
+<b>Returns:</b>
+
+`string`
+
diff --git a/docs/development/core/public/kibana-plugin-public.applicationstart.md b/docs/development/core/public/kibana-plugin-public.applicationstart.md
index 2d1450dce940e7..2a60ff449e44ea 100644
--- a/docs/development/core/public/kibana-plugin-public.applicationstart.md
+++ b/docs/development/core/public/kibana-plugin-public.applicationstart.md
@@ -21,6 +21,7 @@ export interface ApplicationStart
 
 |  Method | Description |
 |  --- | --- |
+|  [getUrlForApp(appId, options)](./kibana-plugin-public.applicationstart.geturlforapp.md) | Returns a relative URL to a given app, including the global base path. |
 |  [navigateToApp(appId, options)](./kibana-plugin-public.applicationstart.navigatetoapp.md) | Navigiate to a given app |
 |  [registerMountContext(contextName, provider)](./kibana-plugin-public.applicationstart.registermountcontext.md) | Register a context provider for application mounting. Will only be available to applications that depend on the plugin that registered this context. |
 
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 1cb8be0d1c8675..552476425d8d88 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -37,6 +37,9 @@ export interface ApplicationSetup {
 // @public (undocumented)
 export interface ApplicationStart {
     capabilities: RecursiveReadonly<Capabilities>;
+    getUrlForApp(appId: string, options?: {
+        path?: string;
+    }): string;
     navigateToApp(appId: string, options?: {
         path?: string;
         state?: any;

From 4152e92be5ca3c07002609f7eefcfd131606de56 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 3 Sep 2019 11:11:57 -0500
Subject: [PATCH 14/14] Bump @types/history

---
 package.json        |  2 +-
 x-pack/package.json |  2 +-
 yarn.lock           | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 614174c8aa3955..d7c1f3c8d32018 100644
--- a/package.json
+++ b/package.json
@@ -305,7 +305,7 @@
     "@types/hapi": "^17.0.18",
     "@types/hapi-auth-cookie": "^9.1.0",
     "@types/has-ansi": "^3.0.0",
-    "@types/history": "^4.7.2",
+    "@types/history": "^4.7.3",
     "@types/hoek": "^4.1.3",
     "@types/humps": "^1.1.2",
     "@types/jest": "^24.0.9",
diff --git a/x-pack/package.json b/x-pack/package.json
index 06404068b1d657..0619d29b968937 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -60,7 +60,7 @@
     "@types/glob": "^7.1.1",
     "@types/graphql": "^0.13.1",
     "@types/hapi__wreck": "^15.0.1",
-    "@types/history": "^4.6.2",
+    "@types/history": "^4.7.3",
     "@types/jest": "^24.0.9",
     "@types/joi": "^13.4.2",
     "@types/js-yaml": "^3.11.1",
diff --git a/yarn.lock b/yarn.lock
index 8cc57e85694668..d56ec4ab750c55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3310,15 +3310,15 @@
   resolved "https://registry.yarnpkg.com/@types/has-ansi/-/has-ansi-3.0.0.tgz#636403dc4e0b2649421c4158e5c404416f3f0330"
   integrity sha512-H3vFOwfLlFEC0MOOrcSkus8PCnMCzz4N0EqUbdJZCdDhBTfkAu86aRYA+MTxjKW6jCpUvxcn4715US8g+28BMA==
 
-"@types/history@*", "@types/history@^4.7.2":
+"@types/history@*":
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.2.tgz#0e670ea254d559241b6eeb3894f8754991e73220"
   integrity sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==
 
-"@types/history@^4.6.2":
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"
-  integrity sha512-eVAb52MJ4lfPLiO9VvTgv8KaZDEIqCwhv+lXOMLlt4C1YHTShgmMULEg0RrCbnqfYd6QKfHsMp0MiX0vWISpSw==
+"@types/history@^4.7.3":
+  version "4.7.3"
+  resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz#856c99cdc1551d22c22b18b5402719affec9839a"
+  integrity sha512-cS5owqtwzLN5kY+l+KgKdRJ/Cee8tlmQoGQuIE9tWnSmS3JMKzmxo2HIAk2wODMifGwO20d62xZQLYz+RLfXmw==
 
 "@types/hoek@^4.1.3":
   version "4.1.3"