Add core-only bundle loading strategy

elastic · Apr 7, 2020 · 3f17e0a · 3f17e0a
1 parent 802322b
commit 3f17e0a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/src/legacy/ui/ui_bundles/ui_bundles_controller.js b/src/legacy/ui/ui_bundles/ui_bundles_controller.js
@@ -99,13 +99,6 @@ 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/bootstrap/template.js.hbs b/src/legacy/ui/ui_render/bootstrap/template.js.hbs
@@ -74,6 +74,29 @@ if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {
       });
     }
 
+    if ('{{appId}}' === 'core') {
+      return load({
+        deps: [
+          {{#each sharedJsDepFilenames}}
+            '{{../regularBundlePath}}/kbn-ui-shared-deps/{{this}}',
+          {{/each}}
+        ],
+        urls: [
+          {
+            deps: [
+              '{{regularBundlePath}}/kbn-ui-shared-deps/{{sharedJsFilename}}',
+            ],
+            urls: [
+              '{{regularBundlePath}}/core/core.plugin.js',
+              {{#each styleSheetPaths}}
+                '{{this}}',
+              {{/each}}
+            ]
+          }
+        ]
+      });
+    }
+
     load({
       deps: [
         {{#each sharedJsDepFilenames}}

diff --git a/src/optimize/bundles_route/bundles_route.js b/src/optimize/bundles_route/bundles_route.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { isAbsolute, extname } from 'path';
+import { isAbsolute, extname, resolve, join } from 'path';
 import LruCache from 'lru-cache';
 import * as UiSharedDeps from '@kbn/ui-shared-deps';
 import { createDynamicAssetResponse } from './dynamic_asset_response';
@@ -85,6 +85,12 @@ export function createBundlesRoute({
         fileHashCache
       )
     ),
+    buildRouteForBundles(
+      `${basePublicPath}/bundles/core/`,
+      `/bundles/core/`,
+      resolve(__dirname, join('..', '..', 'core', 'public', 'target', 'public')),
+      fileHashCache
+    ),
     buildRouteForBundles(
       `${basePublicPath}/bundles/`,
       '/bundles/',

diff --git a/x-pack/plugins/graph/public/application.ts b/x-pack/plugins/graph/public/application.ts
@@ -12,6 +12,8 @@ import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 import '../../../../webpackShims/ace';
 // required for i18nIdDirective
 import 'angular-sanitize';
+// required for ngRoute
+import 'angular-route';
 // type imports
 import {
   AppMountContext,