From 093ec2e19db1a114867b2acc157df23062489f2e Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Wed, 27 Dec 2023 11:36:40 +0100 Subject: [PATCH] Merge branch 'main' of github.com:elastic/kibana into feat/mermaid-markdown --- .../canvas/shareable_runtime/webpack.config.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js index 25ccfefcf127f..e3786b937ea64 100644 --- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js +++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js @@ -141,14 +141,13 @@ module.exports = { { loader: 'sass-loader', options: { - // additionalData(content, loaderContext) { - // return `@import ${stringifyRequest( - // loaderContext, - // path.resolve(KIBANA_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') - // )};\n${content}`; - // }, + additionalData(content, loaderContext) { + return `@import ${stringifyRequest( + loaderContext, + path.resolve(KIBANA_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') + )};\n${content}`; + }, implementation: require('sass-embedded'), - webpackImporter: false, sassOptions: { outputStyle: 'expanded', includePaths: [path.resolve(KIBANA_ROOT, 'node_modules')],