PR comments

elastic · Apr 21, 2020 · 237e2c5 · 237e2c5
1 parent 1fd2e06
commit 237e2c5
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 30 deletions.
diff --git a/packages/kbn-optimizer/src/__fixtures__/mock_repo/src/core/public/entry_point.ts b/packages/kbn-optimizer/src/__fixtures__/mock_repo/src/core/public/entry_point.ts
diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts
@@ -162,7 +162,7 @@ export function getWebpackConfig(bundle: Bundle, worker: WorkerConfig) {
           ],
         },
         {
-          test: /\.(scss|css)$/,
+          test: /\.scss$/,
           exclude: /node_modules/,
           oneOf: [
             {

diff --git a/src/core/public/core.css → src/core/public/_core.scss b/src/core/public/core.css → src/core/public/_core.scss
diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import './core.css';
-
 import { CoreId } from '../server';
 import { PackageInfo, EnvironmentMode } from '../server/types';
 import { CoreSetup, CoreStart } from '.';

diff --git a/src/core/public/entry_point.ts b/src/core/public/entry_point.ts
@@ -20,6 +20,9 @@
 /**
  * This is the entry point used to boot the frontend when serving a application
  * that lives in the Kibana Platform.
+ *
+ * Any changes to this file should be kept in sync with
+ * src/legacy/ui/ui_bundles/app_entry_template.js
  */
 
 import './index.scss';

diff --git a/src/core/public/index.scss b/src/core/public/index.scss
@@ -2,6 +2,7 @@
 // import this explicitly
 @import '../../legacy/ui/public/styles/_styling_constants';
 
+@import './core';
 @import './chrome/index';
 @import './overlays/index';
 @import './rendering/index';

diff --git a/src/legacy/ui/ui_bundles/app_entry_template.js b/src/legacy/ui/ui_bundles/app_entry_template.js
@@ -25,6 +25,9 @@ export const appEntryTemplate = bundle => `
  *
  * This is programmatically created and updated, do not modify
  *
+ * Any changes to this file should be kept in sync with
+ * src/core/public/entry_point.ts
+ *
  * context: ${bundle.getContext()}
  */
 

diff --git a/src/legacy/ui/ui_render/bootstrap/template.js.hbs b/src/legacy/ui/ui_render/bootstrap/template.js.hbs
@@ -69,12 +69,12 @@ if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {
     }
 
     load([
-        {{#each jsDependencies}}
+        {{#each jsDependencyPaths}}
           '{{this}}',
         {{/each}}
     ], function () {
       load([
-        '{{entryBundle}}',
+        '{{entryBundlePath}}',
         {{#each styleSheetPaths}}
           '{{this}}',
         {{/each}}

diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -111,12 +111,13 @@ export function uiRenderMixin(kbnServer, server, config) {
             ? [
                 `${basePath}/bundles/kbn-ui-shared-deps/${UiSharedDeps.darkCssDistFilename}`,
                 `${basePath}/node_modules/@kbn/ui-framework/dist/kui_dark.css`,
+                `${regularBundlePath}/dark_theme.style.css`,
               ]
             : [
                 `${basePath}/bundles/kbn-ui-shared-deps/${UiSharedDeps.lightCssDistFilename}`,
                 `${basePath}/node_modules/@kbn/ui-framework/dist/kui_light.css`,
+                `${regularBundlePath}/light_theme.style.css`,
               ]),
-          `${regularBundlePath}/${darkMode ? 'dark' : 'light'}_theme.style.css`,
           `${regularBundlePath}/commons.style.css`,
           ...(isCore
             ? []
@@ -135,7 +136,7 @@ export function uiRenderMixin(kbnServer, server, config) {
               ]),
         ];
 
-        const jsDependencies = [
+        const jsDependencyPaths = [
           ...UiSharedDeps.jsDepFilenames.map(
             filename => `${regularBundlePath}/kbn-ui-shared-deps/${filename}`
           ),
@@ -155,9 +156,9 @@ export function uiRenderMixin(kbnServer, server, config) {
         const bootstrap = new AppBootstrap({
           templateData: {
             darkMode,
-            jsDependencies,
+            jsDependencyPaths,
             styleSheetPaths,
-            entryBundle: isCore
+            entryBundlePath: isCore
               ? `${regularBundlePath}/core/core.entry.js`
               : `${regularBundlePath}/${app.getId()}.bundle.js`,
           },