From 8d42da35fe9520263f48583abbdb913a765cdcda Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Wed, 12 Jul 2023 23:11:32 +0200 Subject: [PATCH 01/21] Replace deprecated node-sass with sass --- WORKSPACE.bazel | 1 - kbn_pm/src/lib/bazel.mjs | 2 - package.json | 2 +- .../kbn-dom-drag-drop/src/sass/drag_drop.scss | 2 +- .../src/worker/webpack.config.ts | 9 +- packages/kbn-storybook/src/webpack.config.ts | 2 +- .../src/resizable_button.scss | 8 +- renovate.json | 2 +- .../build/tasks/install_dependencies_task.ts | 2 - src/plugins/console/public/styles/_app.scss | 2 +- .../discover_grid/discover_grid.scss | 4 +- .../components/doc_table/_doc_table.scss | 2 +- .../public/markdown/_markdown.scss | 2 +- .../filter_bar/filter_item/filter_item.scss | 8 +- .../saved_query_management_list.scss | 4 +- .../public/_agg_params.scss | 2 +- .../components/_vis_with_splits.scss | 2 +- .../visualizations/views/_metric.scss | 2 +- .../public/vislib/lib/layout/_layout.scss | 2 +- .../shareable_runtime/webpack.config.js | 4 +- .../canvas/storybook/canvas_webpack.ts | 2 +- .../field_data_row/column_chart.scss | 2 +- .../guidance_panel/_guidance_panel.scss | 2 +- .../editor_frame/suggestion_panel.scss | 4 +- .../layer_toc/toc_entry/_toc_entry.scss | 2 +- .../influencers_list/_influencers_list.scss | 4 +- .../components/rule_editor/_rule_editor.scss | 2 +- .../explorer_charts/_explorer_chart.scss | 2 +- .../_timeseriesexplorer_annotations.scss | 8 +- .../shard_allocation/shard_allocation.scss | 2 +- .../components/status_icon/_status_icon.scss | 2 +- .../components/policy_form/_policy_form.scss | 4 +- .../_restore_snapshot_form.scss | 4 +- .../_deprecation_logging_toggle.scss | 2 +- yarn.lock | 240 +++--------------- 35 files changed, 81 insertions(+), 265 deletions(-) diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index f277a7850094..0eefa1469f18 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -57,7 +57,6 @@ yarn_install( quiet = False, frozen_lockfile = False, environment = { - "SASS_BINARY_SITE": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass", "RE2_DOWNLOAD_MIRROR": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2", } ) diff --git a/kbn_pm/src/lib/bazel.mjs b/kbn_pm/src/lib/bazel.mjs index 2ec27b359f15..022447ded129 100644 --- a/kbn_pm/src/lib/bazel.mjs +++ b/kbn_pm/src/lib/bazel.mjs @@ -150,8 +150,6 @@ export async function installYarnDeps(log, opts = undefined) { offline: opts?.offline, quiet: opts?.quiet, env: { - SASS_BINARY_SITE: - 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass', RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2', }, diff --git a/package.json b/package.json index 559f93a4d536..9c6d9e8082f6 100644 --- a/package.json +++ b/package.json @@ -1479,7 +1479,6 @@ "mutation-observer": "^1.0.3", "native-hdr-histogram": "^1.0.0", "nock": "12.0.3", - "node-sass": "^8.0.0", "null-loader": "^3.0.0", "nyc": "^15.1.0", "oboe": "^2.1.4", @@ -1507,6 +1506,7 @@ "regenerate": "^1.4.0", "resolve": "^1.22.0", "rxjs-marbles": "^7.0.1", + "sass": "^1.63.6", "sass-loader": "^10.4.1", "selenium-webdriver": "^4.9.1", "simple-git": "^3.16.0", diff --git a/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss b/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss index ffea63cf94ce..094997e1a4ee 100644 --- a/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss +++ b/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss @@ -99,7 +99,7 @@ $reorderItemMargin: $euiSizeS; position: absolute; width: 100%; top: 0; - height: calc(100% + #{$reorderItemMargin / 2}); + height: calc(100% + #{calc($reorderItemMargin / 2)}); } .domDragDrop-translatableDrop { diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts index 986ec051637e..93685d97b0f8 100644 --- a/packages/kbn-optimizer/src/worker/webpack.config.ts +++ b/packages/kbn-optimizer/src/worker/webpack.config.ts @@ -187,11 +187,14 @@ export function getWebpackConfig( )};\n${content}`; }, webpackImporter: false, - implementation: require('node-sass'), + implementation: require('sass'), sassOptions: { - outputStyle: worker.dist ? 'compressed' : 'nested', + outputStyle: worker.dist ? 'compressed' : 'expanded', includePaths: [Path.resolve(worker.repoRoot, 'node_modules')], - sourceMapRoot: `/${bundle.type}:${bundle.id}`, + sourceMap: true, + // sourceMapRoot: `/${bundle.type}:${bundle.id}`, + quiet: true, + quietDeps: true, }, }, }, diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts index 35bda9718d7c..e9d922d2d7a7 100644 --- a/packages/kbn-storybook/src/webpack.config.ts +++ b/packages/kbn-storybook/src/webpack.config.ts @@ -115,7 +115,7 @@ export default ({ config: storybookConfig }: { config: Configuration }) => { resolve(REPO_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') )};\n${content}`; }, - implementation: require('node-sass'), + implementation: require('sass'), sassOptions: { includePaths: [resolve(REPO_ROOT, 'node_modules')], }, diff --git a/packages/kbn-text-based-editor/src/resizable_button.scss b/packages/kbn-text-based-editor/src/resizable_button.scss index cd0342df39a7..62096bea0973 100644 --- a/packages/kbn-text-based-editor/src/resizable_button.scss +++ b/packages/kbn-text-based-editor/src/resizable_button.scss @@ -13,8 +13,8 @@ z-index: 1; cursor: row-resize; height: $euiSize; - margin-top: -($euiSize / 2); - margin-bottom: -($euiSize / 2); + margin-top: -(calc($euiSize / 2)); + margin-bottom: -(calc($euiSize / 2)); &:before, &:after { @@ -64,7 +64,7 @@ height $euiAnimSpeedFast ease, transform $euiAnimSpeedFast ease ); - transition-delay: $euiAnimSpeedFast / 2; + transition-delay: calc($euiAnimSpeedFast / 2); } } @@ -84,4 +84,4 @@ transform: translate(-50%, 0); } } -} \ No newline at end of file +} diff --git a/renovate.json b/renovate.json index bb1d043c30f4..fe5d94480a7f 100644 --- a/renovate.json +++ b/renovate.json @@ -152,7 +152,7 @@ { "groupName": "scss", "packageNames": [ - "node-sass" + "sass" ], "reviewers": ["team:kibana-operations"], "matchBaseBranches": ["main"], diff --git a/src/dev/build/tasks/install_dependencies_task.ts b/src/dev/build/tasks/install_dependencies_task.ts index 59c9e3891124..0eebadec5ca7 100644 --- a/src/dev/build/tasks/install_dependencies_task.ts +++ b/src/dev/build/tasks/install_dependencies_task.ts @@ -32,8 +32,6 @@ export const InstallDependencies: Task = { { cwd: build.resolvePath(), env: { - SASS_BINARY_SITE: - 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass', RE2_DOWNLOAD_MIRROR: 'https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2', }, diff --git a/src/plugins/console/public/styles/_app.scss b/src/plugins/console/public/styles/_app.scss index 9cbe64372204..2f4340f1de0a 100644 --- a/src/plugins/console/public/styles/_app.scss +++ b/src/plugins/console/public/styles/_app.scss @@ -42,7 +42,7 @@ padding: 0 $euiSizeS; display: inline-block; text-decoration: none; - border-radius: $euiBorderRadius / 2; + border-radius: calc($euiBorderRadius / 2); white-space: nowrap; vertical-align: middle; cursor: default; diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.scss b/src/plugins/discover/public/components/discover_grid/discover_grid.scss index 18fc15f024fa..50b753504dee 100644 --- a/src/plugins/discover/public/components/discover_grid/discover_grid.scss +++ b/src/plugins/discover/public/components/discover_grid/discover_grid.scss @@ -68,8 +68,8 @@ .dscDiscoverGrid__footer { flex-shrink: 0; background-color: $euiColorLightShade; - padding: $euiSize / 2 $euiSize; - margin-top: $euiSize / 4; + padding: calc($euiSize / 2) $euiSize; + margin-top: calc($euiSize / 4); text-align: center; } diff --git a/src/plugins/discover/public/components/doc_table/_doc_table.scss b/src/plugins/discover/public/components/doc_table/_doc_table.scss index 4553cdc05fda..bb53571d06d8 100644 --- a/src/plugins/discover/public/components/doc_table/_doc_table.scss +++ b/src/plugins/discover/public/components/doc_table/_doc_table.scss @@ -68,7 +68,7 @@ dt { background-color: transparentize(shade($euiColorPrimary, 20%), .9); color: $euiTextColor; - padding: ($euiSizeXS / 2) $euiSizeXS; + padding: calc($euiSizeXS / 2) $euiSizeXS; margin-right: $euiSizeXS; word-break: normal; border-radius: $euiBorderRadius; diff --git a/src/plugins/kibana_react/public/markdown/_markdown.scss b/src/plugins/kibana_react/public/markdown/_markdown.scss index c11aefe1f4d9..a3bba38509bc 100644 --- a/src/plugins/kibana_react/public/markdown/_markdown.scss +++ b/src/plugins/kibana_react/public/markdown/_markdown.scss @@ -14,7 +14,7 @@ $kbnDefaultFontSize: 14px; @function canvasToEm($size) { - @return #{$size / $kbnDefaultFontSize}em; + @return #{calc($size / $kbnDefaultFontSize)}em; } .kbnMarkdown__body { diff --git a/src/plugins/unified_search/public/filter_bar/filter_item/filter_item.scss b/src/plugins/unified_search/public/filter_bar/filter_item/filter_item.scss index 787376fac049..5ea42129b2f3 100644 --- a/src/plugins/unified_search/public/filter_bar/filter_item/filter_item.scss +++ b/src/plugins/unified_search/public/filter_bar/filter_item/filter_item.scss @@ -8,8 +8,8 @@ line-height: $euiSize; border: none; color: $euiTextColor; - padding-top: $euiSizeM / 2 + 1px; - padding-bottom: $euiSizeM / 2 + 1px; + padding-top: calc($euiSizeM / 2) + 1px; + padding-bottom: calc($euiSizeM / 2) + 1px; white-space: normal; /* 1 */ &:not(.globalFilterItem-isDisabled) { @@ -54,8 +54,8 @@ left: 0; width: $euiSizeXS; background-color: $kbnGlobalFilterItemBorderColor; - border-top-left-radius: $euiBorderRadius / 2; - border-bottom-left-radius: $euiBorderRadius / 2; + border-top-left-radius: calc($euiBorderRadius / 2); + border-bottom-left-radius: calc($euiBorderRadius / 2); } } diff --git a/src/plugins/unified_search/public/saved_query_management/saved_query_management_list.scss b/src/plugins/unified_search/public/saved_query_management/saved_query_management_list.scss index 7ce304310ae5..2e6f639ea792 100644 --- a/src/plugins/unified_search/public/saved_query_management/saved_query_management_list.scss +++ b/src/plugins/unified_search/public/saved_query_management/saved_query_management_list.scss @@ -5,7 +5,7 @@ } .kbnSavedQueryManagement__text { - padding: $euiSizeM $euiSizeM ($euiSizeM / 2) $euiSizeM; + padding: $euiSizeM $euiSizeM calc($euiSizeM / 2) $euiSizeM; } .kbnSavedQueryManagement__list { @@ -13,5 +13,5 @@ max-height: inherit; // Fixes overflow for applied max-height // Left/Right padding is calculated to match the left alignment of the // popover text and buttons - padding: ($euiSizeM / 2) $euiSizeXS !important; // Override flush + padding: calc($euiSizeM / 2) $euiSizeXS !important; // Override flush } diff --git a/src/plugins/vis_default_editor/public/_agg_params.scss b/src/plugins/vis_default_editor/public/_agg_params.scss index 81faa06681c0..c56ef94c3a4b 100644 --- a/src/plugins/vis_default_editor/public/_agg_params.scss +++ b/src/plugins/vis_default_editor/public/_agg_params.scss @@ -1,7 +1,7 @@ .visEditorAggParam--half { margin: $euiSize 0; display: inline-block; - width: calc(50% - #{$euiSizeS / 2}); + width: calc(50% - #{calc($euiSizeS / 2)}); } .visEditorAggParam--half-size { diff --git a/src/plugins/vis_types/timeseries/public/application/components/_vis_with_splits.scss b/src/plugins/vis_types/timeseries/public/application/components/_vis_with_splits.scss index 9e09a6c3477f..036cf3f6a8fb 100644 --- a/src/plugins/vis_types/timeseries/public/application/components/_vis_with_splits.scss +++ b/src/plugins/vis_types/timeseries/public/application/components/_vis_with_splits.scss @@ -20,7 +20,7 @@ > .tvbVis { // Apply the minimum height on the vis itself so it doesn't interfere with flex calculations // Gauges are not completely square, so the height is just slightly less than the width - min-height: $euiSize * 12 / 1.25; + min-height: calc($euiSize * 12 / 1.25); } } diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/_metric.scss b/src/plugins/vis_types/timeseries/public/application/visualizations/views/_metric.scss index bc2ce4f1a9e4..d5eb056dd172 100644 --- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/_metric.scss +++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/_metric.scss @@ -101,7 +101,7 @@ .tvbVisMetric__label--additional { @include euiTextTruncate; font-size: .25em; /* 1 */ - padding: ($euiSizeXS / 2) 0 0; + padding: calc($euiSizeXS / 2) 0 0; text-align: center; color: $tvbValueColor; line-height: 1.2; // Ensure the descenders don't get cut off diff --git a/src/plugins/vis_types/vislib/public/vislib/lib/layout/_layout.scss b/src/plugins/vis_types/vislib/public/vislib/lib/layout/_layout.scss index 4612602d93f1..8b92af5a4fdc 100644 --- a/src/plugins/vis_types/vislib/public/vislib/lib/layout/_layout.scss +++ b/src/plugins/vis_types/vislib/public/vislib/lib/layout/_layout.scss @@ -203,7 +203,7 @@ } .slice { - stroke-width: $euiSizeXS / 2; + stroke-width: calc($euiSizeXS / 2); stroke: $euiColorEmptyShade; &:hover { diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js index 47b4fb71fb56..5ff67017d7c3 100644 --- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js +++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js @@ -110,7 +110,7 @@ module.exports = { { loader: 'sass-loader', options: { - implementation: require('node-sass'), + implementation: require('sass'), sourceMap: !isProd, }, }, @@ -147,7 +147,7 @@ module.exports = { path.resolve(KIBANA_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') )};\n${content}`; }, - implementation: require('node-sass'), + implementation: require('sass'), webpackImporter: false, sassOptions: { outputStyle: 'nested', diff --git a/x-pack/plugins/canvas/storybook/canvas_webpack.ts b/x-pack/plugins/canvas/storybook/canvas_webpack.ts index 946b6c5b78ce..efe683489f02 100644 --- a/x-pack/plugins/canvas/storybook/canvas_webpack.ts +++ b/x-pack/plugins/canvas/storybook/canvas_webpack.ts @@ -38,7 +38,7 @@ export const canvasWebpack = { { loader: 'sass-loader', options: { - implementation: require('node-sass'), + implementation: require('sass'), }, }, ], diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss index 8a0b9cc992c3..a98eb200f022 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss +++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss @@ -16,7 +16,7 @@ font-weight: normal; text-align: left; line-height: 1.1; - font-size: #{$euiFontSizeL / 2}; // 10px + font-size: #{calc($euiFontSizeL / 2)}; // 10px } .dataGridChart__legend--numeric { diff --git a/x-pack/plugins/graph/public/components/guidance_panel/_guidance_panel.scss b/x-pack/plugins/graph/public/components/guidance_panel/_guidance_panel.scss index add1d0bdf8aa..28e05afe0c78 100644 --- a/x-pack/plugins/graph/public/components/guidance_panel/_guidance_panel.scss +++ b/x-pack/plugins/graph/public/components/guidance_panel/_guidance_panel.scss @@ -28,7 +28,7 @@ .gphGuidancePanel__itemIcon { position: absolute; left: 0; - top: -($euiSizeXS / 2); + top: -(calc($euiSizeXS / 2)); width: $euiSizeL; height: $euiSizeL; padding: $euiSizeXS; diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss index 1619eea882b2..4489d45bfa89 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss @@ -26,8 +26,8 @@ width: $lnsSuggestionWidth !important; // sass-lint:disable-line no-important height: $lnsSuggestionHeight; margin-right: $euiSizeS; - margin-left: $euiSizeXS / 2; - margin-bottom: $euiSizeXS / 2; + margin-left: calc($euiSizeXS / 2); + margin-bottom: calc($euiSizeXS / 2); box-shadow: none !important; // sass-lint:disable-line no-important &:focus { diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/_toc_entry.scss b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/_toc_entry.scss index 959176547dfb..4818d68dbe70 100644 --- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/_toc_entry.scss +++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/layer_toc/toc_entry/_toc_entry.scss @@ -129,7 +129,7 @@ background-color: $euiColorEmptyShade; border: $euiBorderThin; color: $euiTextColor; - border-radius: $euiBorderRadius / 2; + border-radius: calc($euiBorderRadius / 2); height: $euiSize; width: $euiSizeXL; line-height: $euiSize; diff --git a/x-pack/plugins/ml/public/application/components/influencers_list/_influencers_list.scss b/x-pack/plugins/ml/public/application/components/influencers_list/_influencers_list.scss index e33811aa9a8c..1b091e4046c5 100644 --- a/x-pack/plugins/ml/public/application/components/influencers_list/_influencers_list.scss +++ b/x-pack/plugins/ml/public/application/components/influencers_list/_influencers_list.scss @@ -28,7 +28,7 @@ } .progress-bar { - height: $euiSizeXS / 2; + height: calc($euiSizeXS / 2); margin-top: $euiSizeM; text-align: right; line-height: 18px; // SASSTODO: Calc proper value @@ -96,7 +96,7 @@ font-size: 11px; line-height: 14px; border-radius: $euiBorderRadius; - padding: $euiSizeXS / 2; + padding: calc($euiSizeXS / 2); margin-top: $euiSizeXS; display: inline-block; border: $euiBorderThin; diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/_rule_editor.scss b/x-pack/plugins/ml/public/application/components/rule_editor/_rule_editor.scss index 26767dd1e24d..7125917fa4b9 100644 --- a/x-pack/plugins/ml/public/application/components/rule_editor/_rule_editor.scss +++ b/x-pack/plugins/ml/public/application/components/rule_editor/_rule_editor.scss @@ -49,7 +49,7 @@ // SASSTODO: Dangerous EUI overwrite .scope-field-checkbox { - margin-right: $euiSizeXS / 2; + margin-right: calc($euiSizeXS / 2); .euiCheckbox { margin-top: $euiSizeXS; diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/_explorer_chart.scss b/x-pack/plugins/ml/public/application/explorer/explorer_charts/_explorer_chart.scss index 55ebfe8ab3ed..29967e8db9b3 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/_explorer_chart.scss +++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/_explorer_chart.scss @@ -15,7 +15,7 @@ rect.selected-interval { fill: rgba(200, 200, 200, .1); stroke: $euiColorDarkShade; - stroke-width: $euiSizeXS / 2; + stroke-width: calc($euiSizeXS / 2); stroke-opacity: .8; } diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer_annotations.scss b/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer_annotations.scss index a7186597b413..656f38590d3a 100644 --- a/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer_annotations.scss +++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/_timeseriesexplorer_annotations.scss @@ -40,10 +40,10 @@ $mlAnnotationRectDefaultFillOpacity: .05; } .mlAnnotationRect-isBlur { - stroke-opacity: $mlAnnotationRectDefaultStrokeOpacity / 2; + stroke-opacity: calc($mlAnnotationRectDefaultStrokeOpacity / 2); transition: stroke-opacity $euiAnimSpeedFast; - fill-opacity: $mlAnnotationRectDefaultFillOpacity / 2; + fill-opacity: calc($mlAnnotationRectDefaultFillOpacity / 2); transition: fill-opacity $euiAnimSpeedFast; } @@ -95,9 +95,9 @@ $mlAnnotationRectDefaultFillOpacity: .05; } .mlContextAnnotationRect-isBlur { - stroke-opacity: $mlAnnotationRectDefaultStrokeOpacity / 2; + stroke-opacity: calc($mlAnnotationRectDefaultStrokeOpacity / 2); transition: stroke-opacity $euiAnimSpeedFast; - fill-opacity: $mlAnnotationRectDefaultFillOpacity / 2; + fill-opacity: calc($mlAnnotationRectDefaultFillOpacity / 2); transition: fill-opacity $euiAnimSpeedFast; } diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.scss b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.scss index c46d7a048b93..961e0350ccc8 100644 --- a/x-pack/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.scss +++ b/x-pack/plugins/monitoring/public/components/elasticsearch/shard_allocation/shard_allocation.scss @@ -22,7 +22,7 @@ margin: $euiSizeS; border: 1px solid $euiColorMediumShade; border-radius: $euiSizeXS; - padding: $euiSizeXS / 2 0; + padding: calc($euiSizeXS / 2) 0; &.monChild--index { border-left: $euiSizeXS solid $euiColorSuccess; diff --git a/x-pack/plugins/monitoring/public/components/status_icon/_status_icon.scss b/x-pack/plugins/monitoring/public/components/status_icon/_status_icon.scss index 2d36e7fc90f2..50c705f80650 100644 --- a/x-pack/plugins/monitoring/public/components/status_icon/_status_icon.scss +++ b/x-pack/plugins/monitoring/public/components/status_icon/_status_icon.scss @@ -1,7 +1,7 @@ .monStatusIcon { display: inline-block; margin-left: $euiSizeXS; - padding: ($euiSizeXS / 2) $euiSizeS; + padding: calc($euiSizeXS / 2) $euiSizeS; border-radius: $euiBorderRadius; color: $euiColorGhost; min-width: 1.9em; diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss index 0a5187908f85..389e925f392c 100644 --- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss +++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss @@ -4,7 +4,7 @@ .snapshotRestore__policyForm__stepSettings { .euiFormRow--hasEmptyLabelSpace { min-height: auto; - margin-top: $euiFontSizeXS + $euiSizeS + ($euiSizeXXL / 4); + margin-top: $euiFontSizeXS + $euiSizeS + calc($euiSizeXXL / 4); } } @@ -13,4 +13,4 @@ */ .snapshotRestore__policyForm__stepSettings__indicesFieldWrapper .euiFormLabel { width: 100%; -} \ No newline at end of file +} diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss index 6a8f0b951c99..ec680472edf4 100644 --- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss +++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss @@ -5,7 +5,7 @@ .snapshotRestore__restoreForm__stepSettings { .euiFormRow--hasEmptyLabelSpace { min-height: auto; - margin-top: $euiFontSizeXS + $euiSizeS + ($euiSizeXXL / 4); + margin-top: $euiFontSizeXS + $euiSizeS + calc($euiSizeXXL / 4); } } @@ -14,4 +14,4 @@ */ .snapshotRestore__restoreForm__stepLogistics__indicesFieldWrapper .euiFormLabel { width: 100%; -} \ No newline at end of file +} diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/deprecation_logging_toggle/_deprecation_logging_toggle.scss b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/deprecation_logging_toggle/_deprecation_logging_toggle.scss index e8b6ec06ed7c..abcc87b75cd0 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/deprecation_logging_toggle/_deprecation_logging_toggle.scss +++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecation_logs/fix_deprecation_logs/deprecation_logging_toggle/_deprecation_logging_toggle.scss @@ -3,5 +3,5 @@ // them. With this selector we offset the difference so that the content // of the page doesnt jump when toggling between states. .upgToggleLoading > .upgLoadingItem { - margin: $euiSizeM / 2; + margin: calc($euiSizeM / 2); } diff --git a/yarn.lock b/yarn.lock index 0a81b7d2e5ca..09af9a13c088 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2045,7 +2045,7 @@ resolved "https://registry.yarnpkg.com/@foliojs-fork/restructure/-/restructure-2.0.2.tgz#73759aba2aff1da87b7c4554e6839c70d43c92b4" integrity sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA== -"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": +"@gar/promisify@^1.0.1": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== @@ -6185,14 +6185,6 @@ "@gar/promisify" "^1.0.1" semver "^7.3.5" -"@npmcli/fs@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" - integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== - dependencies: - "@gar/promisify" "^1.1.3" - semver "^7.3.5" - "@npmcli/move-file@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.0.1.tgz#de103070dac0f48ce49cf6693c23af59c0f70464" @@ -6200,14 +6192,6 @@ dependencies: mkdirp "^1.0.4" -"@npmcli/move-file@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" - integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - "@octokit/auth-token@^2.4.0": version "2.4.4" resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.4.tgz#ee31c69b01d0378c12fd3ffe406030f3d94d3b56" @@ -10853,11 +10837,6 @@ async-cache@^1.1.0: dependencies: lru-cache "^4.0.0" -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= - async-value-promise@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/async-value-promise/-/async-value-promise-1.1.1.tgz#68957819e3eace804f3b4b69477e2bd276c15378" @@ -11825,30 +11804,6 @@ cacache@^15.0.3, cacache@^15.0.4, cacache@^15.0.5, cacache@^15.2.0: tar "^6.0.2" unique-filename "^1.1.1" -cacache@^16.1.0: - version "16.1.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" - integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== - dependencies: - "@npmcli/fs" "^2.1.0" - "@npmcli/move-file" "^2.0.0" - chownr "^2.0.0" - fs-minipass "^2.1.0" - glob "^8.0.1" - infer-owner "^1.0.4" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - mkdirp "^1.0.4" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^9.0.0" - tar "^6.1.11" - unique-filename "^2.0.0" - cache-base@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" @@ -12186,7 +12141,7 @@ cheerio@^1.0.0-rc.10, cheerio@^1.0.0-rc.3: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@3.5.3, chokidar@^2.1.2, chokidar@^2.1.8, chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.3: +chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^2.1.2, chokidar@^2.1.8, chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -14723,7 +14678,7 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.12, encoding@^0.1.13: +encoding@^0.1.12: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -16532,7 +16487,7 @@ fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^2.0.0, fs-minipass@^2.1.0: +fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -16647,13 +16602,6 @@ gauge@^4.0.0: strip-ansi "^6.0.1" wide-align "^1.1.5" -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - geckodriver@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-4.0.0.tgz#e078518f1b259b9c746bc4cea440dc9480abdbb2" @@ -16878,7 +16826,7 @@ glob@7.2.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0, glob@~7.2.0: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0, glob@~7.2.0: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -16890,7 +16838,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1, glob@^8.0.3: +glob@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== @@ -16901,18 +16849,6 @@ glob@^8.0.1, glob@^8.0.3: minimatch "^5.0.1" once "^1.3.0" -glob@~7.1.1: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - global-dirs@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" @@ -17045,15 +16981,6 @@ globjoin@^0.1.4: resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM= -globule@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" - integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - google-protobuf@^3.6.1: version "3.19.4" resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.4.tgz#8d32c3e34be9250956f28c0fb90955d13f311888" @@ -17901,6 +17828,11 @@ immer@^9.0.15, immer@^9.0.7: resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.15.tgz#0b9169e5b1d22137aba7d43f8a81a495dd1b62dc" integrity sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ== +immutable@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" + integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== + import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" @@ -19649,11 +19581,6 @@ jquery@^3.5.0: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== -js-base64@^2.4.9: - version "2.5.2" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209" - integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ== - js-beautify@1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz#c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1" @@ -20535,7 +20462,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@>4.17.4, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0, lodash@~4.17.10: +lodash@>4.17.4, lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -20699,11 +20626,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.7.1: - version "7.14.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.1.tgz#8da8d2f5f59827edb388e63e459ac23d6d408fea" - integrity sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA== - lru-queue@0.1: version "0.1.0" resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3" @@ -20758,28 +20680,6 @@ make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^10.0.4: - version "10.2.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" - integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== - dependencies: - agentkeepalive "^4.2.1" - cacache "^16.1.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-fetch "^2.0.3" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.3" - promise-retry "^2.0.1" - socks-proxy-agent "^7.0.0" - ssri "^9.0.0" - make-fetch-happen@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" @@ -21388,7 +21288,7 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2, minimatch@~3.0.2: +minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -21439,17 +21339,6 @@ minipass-fetch@^1.3.2: optionalDependencies: encoding "^0.1.12" -minipass-fetch@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" - integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== - dependencies: - minipass "^3.1.6" - minipass-sized "^1.0.3" - minizlib "^2.1.2" - optionalDependencies: - encoding "^0.1.13" - minipass-flush@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" @@ -21471,7 +21360,7 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6, minipass@^3.3.5: +minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.3.5: version "3.3.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== @@ -21485,7 +21374,7 @@ minipass@^4.0.0: dependencies: yallist "^4.0.0" -minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: +minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -21806,7 +21695,7 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.15.0, nan@^2.17.0: +nan@^2.15.0: version "2.17.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== @@ -21887,7 +21776,7 @@ nearley@^2.7.10: randexp "0.4.6" semver "^5.4.1" -negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3: +negotiator@0.6.3, negotiator@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -22117,26 +22006,6 @@ node-releases@^2.0.6: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== -node-sass@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-8.0.0.tgz#c80d52148db0ce88610bcf1e1d112027393c13e1" - integrity sha512-jPzqCF2/e6JXw6r3VxfIqYc8tKQdkj5Z/BDATYyG6FL6b/LuYBNFGFVhus0mthcWifHm/JzBpKAd+3eXsWeK/A== - dependencies: - async-foreach "^0.1.3" - chalk "^4.1.2" - cross-spawn "^7.0.3" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - lodash "^4.17.15" - make-fetch-happen "^10.0.4" - meow "^9.0.0" - nan "^2.17.0" - node-gyp "^8.4.1" - sass-graph "^4.0.1" - stdout-stream "^1.4.0" - "true-case-path" "^2.2.1" - nodemailer@^6.6.2: version "6.6.2" resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.2.tgz#e184c9ed5bee245a3e0bcabc7255866385757114" @@ -25825,16 +25694,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass-graph@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.1.tgz#2ff8ca477224d694055bf4093f414cf6cfad1d2e" - integrity sha512-5YCfmGBmxoIRYHnKK2AKzrAkCoQ8ozO+iumT8K4tXJXRVCPf+7s1/9KxTSW3Rbvf+7Y7b4FR3mWyLnQr3PHocA== - dependencies: - glob "^7.0.0" - lodash "^4.17.11" - scss-tokenizer "^0.4.3" - yargs "^17.2.1" - sass-loader@^10.4.1: version "10.4.1" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.4.1.tgz#bea4e173ddf512c9d7f53e9ec686186146807cbf" @@ -25846,6 +25705,15 @@ sass-loader@^10.4.1: schema-utils "^3.0.0" semver "^7.3.2" +sass@^1.63.6: + version "1.63.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea" + integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + sax@>=0.6.0, sax@^1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -25936,14 +25804,6 @@ screenfull@^5.0.0: resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-5.0.0.tgz#5c2010c0e84fd4157bf852877698f90b8cbe96f6" integrity sha512-yShzhaIoE9OtOhWVyBBffA6V98CDCoyHTsp8228blmqYy1Z5bddzE/4FPiJKlr8DVR4VBiiUyfPzIQPIYDkeMA== -scss-tokenizer@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.4.3.tgz#1058400ee7d814d71049c29923d2b25e61dc026c" - integrity sha512-raKLgf1LI5QMQnG+RxHz6oK0sL3x3I4FN2UDLqgLOGO8hodECNnNh5BXn7fAyBxrA8zVzdQizQ6XjNJQ+uBwMw== - dependencies: - js-base64 "^2.4.9" - source-map "^0.7.3" - secure-json-parse@^2.4.0: version "2.6.0" resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.6.0.tgz#95d89f84adf32d76ff7800e68a673b129fe918b0" @@ -26420,16 +26280,7 @@ socks-proxy-agent@^6.0.0: debug "^4.3.1" socks "^2.6.1" -socks-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" - integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks@^2.6.1, socks@^2.6.2: +socks@^2.6.1: version "2.7.1" resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== @@ -26474,7 +26325,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -26725,13 +26576,6 @@ ssri@^8.0.0, ssri@^8.0.1: dependencies: minipass "^3.1.1" -ssri@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" - integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== - dependencies: - minipass "^3.1.1" - stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -26841,13 +26685,6 @@ stats-lite@^2.2.0: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -stdout-stream@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" - integrity sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s= - dependencies: - readable-stream "^2.0.1" - store2@^2.12.0: version "2.12.0" resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf" @@ -27448,7 +27285,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.0.2, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2: +tar@^6.0.2, tar@^6.1.13, tar@^6.1.2: version "6.1.13" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== @@ -27938,11 +27775,6 @@ trough@^1.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.1.tgz#a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86" integrity sha1-qf2LA5Swro//guBjOgo2zK1bX4Y= -"true-case-path@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf" - integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q== - ts-debounce@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/ts-debounce/-/ts-debounce-4.0.0.tgz#33440ef64fab53793c3d546a8ca6ae539ec15841" @@ -28310,13 +28142,6 @@ unique-filename@^1.1.1: dependencies: unique-slug "^2.0.0" -unique-filename@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" - integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== - dependencies: - unique-slug "^3.0.0" - unique-slug@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" @@ -28324,13 +28149,6 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-slug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" - integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== - dependencies: - imurmurhash "^0.1.4" - unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" From 4757eff309507e96ab86dee8ac1c4c339d6c20d0 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 13 Jul 2023 09:25:37 +0200 Subject: [PATCH 02/21] fix --- packages/kbn-optimizer/src/worker/webpack.config.ts | 2 -- packages/kbn-storybook/src/webpack.config.ts | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts index 93685d97b0f8..397e7972cb2b 100644 --- a/packages/kbn-optimizer/src/worker/webpack.config.ts +++ b/packages/kbn-optimizer/src/worker/webpack.config.ts @@ -192,8 +192,6 @@ export function getWebpackConfig( outputStyle: worker.dist ? 'compressed' : 'expanded', includePaths: [Path.resolve(worker.repoRoot, 'node_modules')], sourceMap: true, - // sourceMapRoot: `/${bundle.type}:${bundle.id}`, - quiet: true, quietDeps: true, }, }, diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts index e9d922d2d7a7..646bf38b6a33 100644 --- a/packages/kbn-storybook/src/webpack.config.ts +++ b/packages/kbn-storybook/src/webpack.config.ts @@ -118,6 +118,7 @@ export default ({ config: storybookConfig }: { config: Configuration }) => { implementation: require('sass'), sassOptions: { includePaths: [resolve(REPO_ROOT, 'node_modules')], + quietDeps: true, }, }, }, From eb127d32283d5f585d0ea618ef08f32b2c113bd0 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 13 Jul 2023 10:34:23 +0200 Subject: [PATCH 03/21] fix --- .buildkite/pipelines/on_merge.yml | 2 +- .buildkite/pipelines/pull_request/storybooks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 2ea182a76c61..7e6ce7b5d7b5 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -141,7 +141,7 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 60 + timeout_in_minutes: 100 retry: automatic: - exit_status: '-1' diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml index b62ba6056317..4eb965c23bea 100644 --- a/.buildkite/pipelines/pull_request/storybooks.yml +++ b/.buildkite/pipelines/pull_request/storybooks.yml @@ -4,4 +4,4 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 60 + timeout_in_minutes: 100 From 69d3dfb35b6a46dd0bcc4d8b2dc9969b5c67033e Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 13 Jul 2023 14:24:45 +0200 Subject: [PATCH 04/21] decrease timeout --- .buildkite/pipelines/on_merge.yml | 2 +- .buildkite/pipelines/pull_request/storybooks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 7e6ce7b5d7b5..1d72cd1c5f99 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -141,7 +141,7 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 100 + timeout_in_minutes: 80 retry: automatic: - exit_status: '-1' diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml index 4eb965c23bea..714cf057a310 100644 --- a/.buildkite/pipelines/pull_request/storybooks.yml +++ b/.buildkite/pipelines/pull_request/storybooks.yml @@ -4,4 +4,4 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 100 + timeout_in_minutes: 80 From 9724bd90cf6bd5d0f4c54390aef0b1f947acd77e Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 13 Jul 2023 16:30:36 +0200 Subject: [PATCH 05/21] revert --- .buildkite/pipelines/on_merge.yml | 2 +- .buildkite/pipelines/pull_request/storybooks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 1d72cd1c5f99..2ea182a76c61 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -141,7 +141,7 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 80 + timeout_in_minutes: 60 retry: automatic: - exit_status: '-1' diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml index 714cf057a310..b62ba6056317 100644 --- a/.buildkite/pipelines/pull_request/storybooks.yml +++ b/.buildkite/pipelines/pull_request/storybooks.yml @@ -4,4 +4,4 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 80 + timeout_in_minutes: 60 From 3179c11aa74bb6724873c84ed570ed9404196798 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 13 Jul 2023 19:06:27 +0200 Subject: [PATCH 06/21] timeout --- .buildkite/pipelines/on_merge.yml | 2 +- .buildkite/pipelines/pull_request/storybooks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 2ea182a76c61..561f923167dd 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -141,7 +141,7 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 60 + timeout_in_minutes: 70 retry: automatic: - exit_status: '-1' diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml index b62ba6056317..8b127ab92dc3 100644 --- a/.buildkite/pipelines/pull_request/storybooks.yml +++ b/.buildkite/pipelines/pull_request/storybooks.yml @@ -4,4 +4,4 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 60 + timeout_in_minutes: 70 From e6bf726afc94d9e181261dd778976cf253581106 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Fri, 14 Jul 2023 12:38:36 +0200 Subject: [PATCH 07/21] fix --- .../controls/public/options_list/components/options_list.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/controls/public/options_list/components/options_list.scss b/src/plugins/controls/public/options_list/components/options_list.scss index 0309437b8c9b..1719275a71a3 100644 --- a/src/plugins/controls/public/options_list/components/options_list.scss +++ b/src/plugins/controls/public/options_list/components/options_list.scss @@ -14,7 +14,7 @@ border-color: darken($euiColorLightestShade, 2%); .optionsList__actionsRow { - margin: ($euiSizeS / 2) 0 !important; + margin: calc($euiSizeS / 2) 0 !important; .optionsList__actionBarDivider { height: $euiSize; From 0bd8025d6893a78e60a329721f1ea13d595f6d28 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Fri, 14 Jul 2023 17:39:01 +0200 Subject: [PATCH 08/21] timeout --- .buildkite/pipelines/on_merge.yml | 2 +- .buildkite/pipelines/pull_request/storybooks.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 561f923167dd..1d72cd1c5f99 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -141,7 +141,7 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 70 + timeout_in_minutes: 80 retry: automatic: - exit_status: '-1' diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml index 8b127ab92dc3..714cf057a310 100644 --- a/.buildkite/pipelines/pull_request/storybooks.yml +++ b/.buildkite/pipelines/pull_request/storybooks.yml @@ -4,4 +4,4 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 70 + timeout_in_minutes: 80 From d2b44de09e1a56300849ec61c2df4e566ca57ffa Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 20 Jul 2023 20:18:29 +0200 Subject: [PATCH 09/21] sass-embedded --- .buildkite/pipelines/on_merge.yml | 2 +- .../pipelines/pull_request/storybooks.yml | 2 +- package.json | 5 +- .../src/worker/webpack.config.ts | 2 +- packages/kbn-storybook/src/webpack.config.ts | 2 +- patches/sass-loader+10.4.1.patch | 14 ++ .../shareable_runtime/webpack.config.js | 4 +- .../canvas/storybook/canvas_webpack.ts | 2 +- yarn.lock | 153 ++++++++++++++---- 9 files changed, 151 insertions(+), 35 deletions(-) create mode 100644 patches/sass-loader+10.4.1.patch diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml index 1d72cd1c5f99..2ea182a76c61 100644 --- a/.buildkite/pipelines/on_merge.yml +++ b/.buildkite/pipelines/on_merge.yml @@ -141,7 +141,7 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 80 + timeout_in_minutes: 60 retry: automatic: - exit_status: '-1' diff --git a/.buildkite/pipelines/pull_request/storybooks.yml b/.buildkite/pipelines/pull_request/storybooks.yml index 714cf057a310..b62ba6056317 100644 --- a/.buildkite/pipelines/pull_request/storybooks.yml +++ b/.buildkite/pipelines/pull_request/storybooks.yml @@ -4,4 +4,4 @@ steps: agents: queue: n2-4-spot key: storybooks - timeout_in_minutes: 80 + timeout_in_minutes: 60 diff --git a/package.json b/package.json index bc9365ae6a33..e531089174bc 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "dev-docs": "scripts/dev_docs.sh", "es": "node scripts/es", "preinstall": "node ./preinstall_check", + "postinstall": "patch-package", "kbn": "node scripts/kbn", "lint": "yarn run lint:es && yarn run lint:style", "lint:es": "node scripts/eslint", @@ -1485,6 +1486,7 @@ "oboe": "^2.1.4", "openapi-types": "^10.0.0", "p-reflect": "2.1.0", + "patch-package": "^7.0.2", "pbf": "3.2.1", "peggy": "^1.2.0", "picomatch": "^2.3.1", @@ -1498,6 +1500,7 @@ "postcss-loader": "^4.2.0", "postcss-prefix-selector": "^1.16.0", "postcss-scss": "^4.0.4", + "postinstall-postinstall": "^2.1.0", "prettier": "^2.7.1", "proxy": "^2.1.1", "q": "^1.5.1", @@ -1507,7 +1510,7 @@ "regenerate": "^1.4.0", "resolve": "^1.22.0", "rxjs-marbles": "^7.0.1", - "sass": "^1.63.6", + "sass-embedded": "^1.64.0", "sass-loader": "^10.4.1", "selenium-webdriver": "^4.9.1", "simple-git": "^3.16.0", diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts index 397e7972cb2b..b371d9b1ca2b 100644 --- a/packages/kbn-optimizer/src/worker/webpack.config.ts +++ b/packages/kbn-optimizer/src/worker/webpack.config.ts @@ -187,7 +187,7 @@ export function getWebpackConfig( )};\n${content}`; }, webpackImporter: false, - implementation: require('sass'), + implementation: require('sass-embedded'), sassOptions: { outputStyle: worker.dist ? 'compressed' : 'expanded', includePaths: [Path.resolve(worker.repoRoot, 'node_modules')], diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts index 646bf38b6a33..282a41dcbd45 100644 --- a/packages/kbn-storybook/src/webpack.config.ts +++ b/packages/kbn-storybook/src/webpack.config.ts @@ -115,7 +115,7 @@ export default ({ config: storybookConfig }: { config: Configuration }) => { resolve(REPO_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') )};\n${content}`; }, - implementation: require('sass'), + implementation: require('sass-embedded'), sassOptions: { includePaths: [resolve(REPO_ROOT, 'node_modules')], quietDeps: true, diff --git a/patches/sass-loader+10.4.1.patch b/patches/sass-loader+10.4.1.patch new file mode 100644 index 000000000000..f76d47d3b349 --- /dev/null +++ b/patches/sass-loader+10.4.1.patch @@ -0,0 +1,14 @@ +diff --git a/node_modules/sass-loader/dist/utils.js b/node_modules/sass-loader/dist/utils.js +index cd50f34..3bee594 100644 +--- a/node_modules/sass-loader/dist/utils.js ++++ b/node_modules/sass-loader/dist/utils.js +@@ -93,6 +93,9 @@ function getSassImplementation(loaderContext, implementation) { + } // eslint-disable-next-line consistent-return + + ++ return resolvedImplementation; ++ } else if (implementationName === "sass-embedded") { ++ // eslint-disable-next-line consistent-return + return resolvedImplementation; + } + diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js index 5ff67017d7c3..62c79116bfb1 100644 --- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js +++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js @@ -110,7 +110,7 @@ module.exports = { { loader: 'sass-loader', options: { - implementation: require('sass'), + implementation: require('sass-embedded'), sourceMap: !isProd, }, }, @@ -147,7 +147,7 @@ module.exports = { path.resolve(KIBANA_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') )};\n${content}`; }, - implementation: require('sass'), + implementation: require('sass-embedded'), webpackImporter: false, sassOptions: { outputStyle: 'nested', diff --git a/x-pack/plugins/canvas/storybook/canvas_webpack.ts b/x-pack/plugins/canvas/storybook/canvas_webpack.ts index efe683489f02..c6ae4a9dbaa9 100644 --- a/x-pack/plugins/canvas/storybook/canvas_webpack.ts +++ b/x-pack/plugins/canvas/storybook/canvas_webpack.ts @@ -38,7 +38,7 @@ export const canvasWebpack = { { loader: 'sass-loader', options: { - implementation: require('sass'), + implementation: require('sass-embedded'), }, }, ], diff --git a/yarn.lock b/yarn.lock index da2834fe9037..77c04e52c867 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1259,6 +1259,11 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@bufbuild/protobuf@^1.0.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.2.1.tgz#f8b1fbbe79726a4eafa9772ddde147b57f85d177" + integrity sha512-cwwGvLGqvoaOZmoP5+i4v/rbW+rHkguvTehuZyM2p/xpmaNSdT2h3B7kHw33aiffv35t1XrYHIkdJSEkSEMJuA== + "@cbor-extract/cbor-extract-darwin-arm64@2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@cbor-extract/cbor-extract-darwin-arm64/-/cbor-extract-darwin-arm64-2.0.0.tgz#cf0667e4c22111c9d45e16c29964892b12460a76" @@ -11714,6 +11719,11 @@ btoa-lite@^1.0.0: resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337" integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc= +buffer-builder@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/buffer-builder/-/buffer-builder-0.2.0.tgz#3322cd307d8296dab1f604618593b261a3fade8f" + integrity sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg== + buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -12208,7 +12218,7 @@ cheerio@^1.0.0-rc.10, cheerio@^1.0.0-rc.3: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^2.1.2, chokidar@^2.1.8, chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.3: +chokidar@3.5.3, chokidar@^2.1.2, chokidar@^2.1.8, chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -12272,10 +12282,10 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.2.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.1.tgz#58331f6f472a25fe3a50a351ae3052936c2c7f32" - integrity sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg== +ci-info@^3.2.0, ci-info@^3.7.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" + integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -16264,6 +16274,13 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + flat-cache@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" @@ -22451,10 +22468,10 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -open@^7.0.3: - version "7.1.0" - resolved "https://registry.yarnpkg.com/open/-/open-7.1.0.tgz#68865f7d3cb238520fa1225a63cf28bcf8368a1c" - integrity sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA== +open@^7.0.3, open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== dependencies: is-docker "^2.0.0" is-wsl "^2.1.1" @@ -22920,6 +22937,26 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= +patch-package@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-7.0.2.tgz#c01589bb6964854b5210506a5845d47900641f5a" + integrity sha512-PMYfL8LXxGIRmxXLqlEaBxzKPu7/SdP13ld6GSfAUJUZRmBDPp8chZs0dpzaAFn9TSPnFiMwkC6PJt6pBiAl8Q== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + ci-info "^3.7.0" + cross-spawn "^7.0.3" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^7.5.3" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^2.2.2" + path-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" @@ -23600,6 +23637,11 @@ postcss@^8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" +postinstall-postinstall@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/postinstall-postinstall/-/postinstall-postinstall-2.1.0.tgz#4f7f77441ef539d1512c40bd04c71b06a4704ca3" + integrity sha512-7hQX6ZlZXIoRiWNrbMQaLzUUfH+sSx39u8EJ9HYuDc1kLo9IXKWjM5RSquZN1ad5GnH8CGFM78fsAAQi3OKEEQ== + potpack@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/potpack/-/potpack-2.0.0.tgz#61f4dd2dc4b3d5e996e3698c0ec9426d0e169104" @@ -25695,10 +25737,10 @@ rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.1, rxjs@^6.6.0, rxjs@^6.6.7: dependencies: tslib "^1.9.0" -rxjs@^7.0.0, rxjs@^7.5.5: - version "7.5.5" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f" - integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw== +rxjs@^7.0.0, rxjs@^7.5.5, rxjs@^7.4.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== dependencies: tslib "^2.1.0" @@ -25761,6 +25803,67 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sass-embedded-darwin-arm64@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.64.0.tgz#433eaa3be1efab7053d149a5c5208d7f40a91594" + integrity sha512-GZNE6PYa3ngMuTbd5Wse3NwwZ/Nba2qjbjoFlcMyydNCTbLUszBrewAsbOwncm1p8uFYirB56IDvCbJ0XliVAQ== + +sass-embedded-darwin-x64@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.64.0.tgz#3afb396e6be2a7217a866bc3d1785f4d50fc6673" + integrity sha512-Uk7xUgUx+aioJbgB8SbaqV9iY34+dUmlSRXxhkfHOruRAGP3EjwIcA8y8mbqkOlFveg0nlfLdb6Yaj+OC6LkDw== + +sass-embedded-linux-arm64@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.64.0.tgz#e372d876923ba6dd58c18b9cd800700e60747518" + integrity sha512-m0FfI1GTFRj7+HXKRNGOxEFMfnfmEfdc6mpU18XjxLmfipyn0m2tAW2jVGTcCbUQ+gWhl2wW59LtggrGvkOZBQ== + +sass-embedded-linux-arm@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.64.0.tgz#484e54ec6ac80523c28666d2a57d083a20167b25" + integrity sha512-S/EHZa5wfcJx2Xo056PsKLcUv4YvW+kFIoNidZNDSaaWtAv1a3ClklM5GAYRhwR7ZWvJCzzbrVsJQuEta/55sA== + +sass-embedded-linux-ia32@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.64.0.tgz#f13bc6178a1cbfbc09e8cbb0b8967463a7aa733c" + integrity sha512-LTLh0OoiBIOi121Lqbrm718xhCBnjbFJOh61k/5B4jRhqL1vQ4sSrsQanptZw59WTu8pB/CHKG5rqmxMJPN4Rg== + +sass-embedded-linux-x64@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.64.0.tgz#130ac274765e732b00e936472f83f2e93653b7dc" + integrity sha512-GAg+dofXpAa1v0tUKD7qs+Jmza5x+Qk+X5uGwOVCn8QXAOSfRFMNFpzgXK0hNc4ZRUPw+CXANkBdws2lYM2JEQ== + +sass-embedded-win32-ia32@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.64.0.tgz#12b3829b0108dfae3ecae1a20633374700121dec" + integrity sha512-mXor9yhqcnSht8IowSbhf/U8Xhn+6dy+CDz0x6Y+/uhR1QsMKqeXwhoNr6UIlVGsraTQqovD15TQ+2Khcoj3fw== + +sass-embedded-win32-x64@1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.64.0.tgz#8b4134d6e14a431aa0bd22045a08e1c27e1a0f46" + integrity sha512-yfr4VYpE0DFOj4wSeIQ7dg+8IT0Ow3rCYrVDocrpDJ2mz6u5w1a4txkiLzgkl1rIW9DbGa0sNeXzwuHQLN6adQ== + +sass-embedded@^1.64.0: + version "1.64.0" + resolved "https://registry.yarnpkg.com/sass-embedded/-/sass-embedded-1.64.0.tgz#0fde82f0d2d537cc4f3b6df9de7f12b8d8fb72f3" + integrity sha512-lr48TpBdTWG3u/0gtGFhF9tVLaLvdJoRkM5rc8x7nyIzzFekqJAuCtn3X/Y8npb24Bz5Qc5SVrtOplNIHM+SBA== + dependencies: + "@bufbuild/protobuf" "^1.0.0" + buffer-builder "^0.2.0" + immutable "^4.0.0" + rxjs "^7.4.0" + supports-color "^8.1.1" + varint "^6.0.0" + optionalDependencies: + sass-embedded-darwin-arm64 "1.64.0" + sass-embedded-darwin-x64 "1.64.0" + sass-embedded-linux-arm "1.64.0" + sass-embedded-linux-arm64 "1.64.0" + sass-embedded-linux-ia32 "1.64.0" + sass-embedded-linux-x64 "1.64.0" + sass-embedded-win32-ia32 "1.64.0" + sass-embedded-win32-x64 "1.64.0" + sass-loader@^10.4.1: version "10.4.1" resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.4.1.tgz#bea4e173ddf512c9d7f53e9ec686186146807cbf" @@ -25772,15 +25875,6 @@ sass-loader@^10.4.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.63.6: - version "1.63.6" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.6.tgz#481610e612902e0c31c46b46cf2dad66943283ea" - integrity sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - sax@>=0.6.0, sax@^1.2.1: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -26414,7 +26508,7 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -28678,6 +28772,11 @@ variable-diff@1.1.0: chalk "^1.1.1" object-assign "^4.0.1" +varint@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" + integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -29942,10 +30041,10 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yaml@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.3.tgz#9b3a4c8aff9821b696275c79a8bee8399d945207" - integrity sha512-AacA8nRULjKMX2DvWvOAdBZMOfQlypSFkjcOcu9FalllIDJ1kvlREzcdIZmidQUqqeMv7jorHjq2HlLv/+c2lg== +yaml@^2.1.3, yaml@^2.2.2: + version "2.3.1" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b" + integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ== yargs-parser@20.2.4, yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.4" From fcb95dad23dcea1d4a6909bcb2694b8ac34ae426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= Date: Thu, 20 Jul 2023 22:30:11 +0200 Subject: [PATCH 10/21] Update casing_check_config.js --- src/dev/precommit_hook/casing_check_config.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index 635ae7ec6568..4e42da47e04c 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -77,6 +77,9 @@ export const IGNORE_FILE_GLOBS = [ // generator templates use weird filenames based on the requirements for the files they're generating 'packages/kbn-generate/templates/**/*', + + // patch-package artifacts + 'patches/*', ]; /** @@ -110,7 +113,6 @@ export const IGNORE_DIRECTORY_GLOBS = [ 'x-pack/dev-tools', 'packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack', 'typings/*', - 'patches/*', ]; /** From acd566aa06a1a1fd275de33b4e103d6181ef731b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= Date: Thu, 20 Jul 2023 22:30:48 +0200 Subject: [PATCH 11/21] Update renovate.json --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index ae75a8c1ba4f..a016ae9f71a9 100644 --- a/renovate.json +++ b/renovate.json @@ -307,7 +307,7 @@ { "groupName": "scss", "packageNames": [ - "sass" + "sass-embedded" ], "reviewers": [ "team:kibana-operations" @@ -592,4 +592,4 @@ "enabled": true } ] -} \ No newline at end of file +} From 34e02fe57a567853f34b973087cdd31b6b2643d3 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 20 Jul 2023 22:56:49 +0200 Subject: [PATCH 12/21] add license --- src/dev/license_checker/config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index c12e6f91b821..54051a0bcdd5 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -69,6 +69,7 @@ export const LICENSE_ALLOWED = [ 'Python-2.0', '(Apache-2.0 AND MIT)', 'BlueOak-1.0.0', + '(Apache-2.0 AND BSD-3-Clause)', ]; // The following list only applies to licenses that From 33e3f7cf7b3a02a8d7d3f2ca22c7e75aa47a8302 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 7 Dec 2023 12:25:17 +0100 Subject: [PATCH 13/21] test --- packages/kbn-optimizer/src/worker/webpack.config.ts | 9 --------- packages/kbn-storybook/src/webpack.config.ts | 6 ------ .../editor_frame/suggestion_panel.scss | 5 ----- 3 files changed, 20 deletions(-) diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts index ff64fbfb5148..fec9032c73a7 100644 --- a/packages/kbn-optimizer/src/worker/webpack.config.ts +++ b/packages/kbn-optimizer/src/worker/webpack.config.ts @@ -176,15 +176,6 @@ export function getWebpackConfig( { loader: 'sass-loader', options: { - additionalData(content: string, loaderContext: webpack.loader.LoaderContext) { - return `@import ${stringifyRequest( - loaderContext, - Path.resolve( - worker.repoRoot, - `src/core/public/styles/core_app/_globals_${theme}.scss` - ) - )};\n${content}`; - }, webpackImporter: false, implementation: require('sass-embedded'), sassOptions: { diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts index 282a41dcbd45..bfb0f00222bb 100644 --- a/packages/kbn-storybook/src/webpack.config.ts +++ b/packages/kbn-storybook/src/webpack.config.ts @@ -109,12 +109,6 @@ export default ({ config: storybookConfig }: { config: Configuration }) => { { loader: 'sass-loader', options: { - additionalData(content: string, loaderContext: any) { - return `@import ${stringifyRequest( - loaderContext, - resolve(REPO_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') - )};\n${content}`; - }, implementation: require('sass-embedded'), sassOptions: { includePaths: [resolve(REPO_ROOT, 'node_modules')], diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss index 2f68e88c872f..35606c67382d 100644 --- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss +++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.scss @@ -25,14 +25,9 @@ flex: 0 0 auto; height: $lnsSuggestionHeight; margin-right: $euiSizeS; -<<<<<<< HEAD margin-left: calc($euiSizeXS / 2); margin-bottom: calc($euiSizeXS / 2); -======= - margin-left: $euiSizeXS / 2; - margin-bottom: $euiSizeXS / 2; padding: 0 $euiSizeS; ->>>>>>> 6628232433c0144f7564b22d8e6d2941425431ae box-shadow: none !important; // sass-lint:disable-line no-important &:focus { From 17532ada4eaf92e9ddfd2dbbd4f323751dd924ad Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 7 Dec 2023 13:00:00 +0100 Subject: [PATCH 14/21] fix --- packages/kbn-optimizer/src/worker/webpack.config.ts | 10 +++++++++- packages/kbn-storybook/src/webpack.config.ts | 6 ++++++ .../unified_field_list_sidebar/field_list_sidebar.scss | 2 +- .../public/options_list/components/options_list.scss | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/kbn-optimizer/src/worker/webpack.config.ts b/packages/kbn-optimizer/src/worker/webpack.config.ts index fec9032c73a7..7b4a5b27b78c 100644 --- a/packages/kbn-optimizer/src/worker/webpack.config.ts +++ b/packages/kbn-optimizer/src/worker/webpack.config.ts @@ -176,7 +176,15 @@ export function getWebpackConfig( { loader: 'sass-loader', options: { - webpackImporter: false, + additionalData(content: string, loaderContext: webpack.loader.LoaderContext) { + return `@import ${stringifyRequest( + loaderContext, + Path.resolve( + worker.repoRoot, + `src/core/public/styles/core_app/_globals_${theme}.scss` + ) + )};\n${content}`; + }, implementation: require('sass-embedded'), sassOptions: { outputStyle: worker.dist ? 'compressed' : 'expanded', diff --git a/packages/kbn-storybook/src/webpack.config.ts b/packages/kbn-storybook/src/webpack.config.ts index bfb0f00222bb..282a41dcbd45 100644 --- a/packages/kbn-storybook/src/webpack.config.ts +++ b/packages/kbn-storybook/src/webpack.config.ts @@ -109,6 +109,12 @@ export default ({ config: storybookConfig }: { config: Configuration }) => { { loader: 'sass-loader', options: { + additionalData(content: string, loaderContext: any) { + return `@import ${stringifyRequest( + loaderContext, + resolve(REPO_ROOT, 'src/core/public/styles/core_app/_globals_v8light.scss') + )};\n${content}`; + }, implementation: require('sass-embedded'), sassOptions: { includePaths: [resolve(REPO_ROOT, 'node_modules')], diff --git a/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.scss b/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.scss index 48fb44f1663e..08402941bf74 100644 --- a/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.scss +++ b/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.scss @@ -53,7 +53,7 @@ .unifiedFieldListSidebar .unifiedFieldListItemButton { &.kbnFieldButton { - margin-bottom: $euiSizeXS / 2; + margin-bottom: calc($euiSizeXS / 2); } &.domDragDrop-isDraggable { diff --git a/src/plugins/controls/public/options_list/components/options_list.scss b/src/plugins/controls/public/options_list/components/options_list.scss index 5fd2ed96f0b3..e0c749441ff6 100644 --- a/src/plugins/controls/public/options_list/components/options_list.scss +++ b/src/plugins/controls/public/options_list/components/options_list.scss @@ -65,7 +65,7 @@ } .optionsList__actionsRow { - margin: ($euiSizeS / 2) 0 !important; + margin: calc($euiSizeS / 2) 0 !important; .optionsList__actionBarDivider { height: $euiSize; From 4f1c6d17d8b95c88b900fcceeb7a1e060aae04b5 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 7 Dec 2023 16:38:35 +0100 Subject: [PATCH 15/21] fix --- src/dev/license_checker/config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 08d4267e52b6..31442c71c60a 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -88,4 +88,5 @@ export const LICENSE_OVERRIDES = { '@elastic/eui@90.0.1-backport.0': ['SSPL-1.0 OR Elastic License 2.0'], 'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry 'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary + '@bufbuild/protobuf': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) }; From bd47e8b32833a41b5344c8b3713f434357c1c314 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Thu, 7 Dec 2023 17:08:39 +0100 Subject: [PATCH 16/21] fix --- src/dev/license_checker/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 31442c71c60a..64ce3f974035 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -88,5 +88,5 @@ export const LICENSE_OVERRIDES = { '@elastic/eui@90.0.1-backport.0': ['SSPL-1.0 OR Elastic License 2.0'], 'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry 'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary - '@bufbuild/protobuf': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) + '@bufbuild/protobuf@1.2.1': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) }; From df126258cb435c1c1232369bf9c1bd6b5459030f Mon Sep 17 00:00:00 2001 From: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Date: Tue, 19 Dec 2023 12:38:25 +0000 Subject: [PATCH 17/21] [CI] Auto-commit changed files from 'node scripts/eslint --no-cache --fix' --- yarn.lock | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/yarn.lock b/yarn.lock index 988e10d02156..6cadef9c5765 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17367,39 +17367,10 @@ gauge@^3.0.0: strip-ansi "^6.0.1" wide-align "^1.1.2" -<<<<<<< HEAD -geckodriver@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-4.2.1.tgz#03ad628241417737b962966aa8f8b13fa0f8bf75" - integrity sha512-4m/CRk0OI8MaANRuFIahvOxYTSjlNAO2p9JmE14zxueknq6cdtB5M9UGRQ8R9aMV0bLGNVHHDnDXmoXdOwJfWg== -======= -gauge@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.2.tgz#c3777652f542b6ef62797246e8c7caddecb32cc7" - integrity sha512-aSPRm2CvA9R8QyU5eXMFPd+cYkyxLsXHd2l5/FOH2V/eml//M04G6KZOmTap07O1PvEwNcl2NndyLfK8g3QrKA== - dependencies: - ansi-regex "^5.0.1" - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g== - dependencies: - globule "^1.0.0" - geckodriver@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/geckodriver/-/geckodriver-4.3.0.tgz#8586e80ddd23e5d5cd47382d9f6897051ca12ea3" integrity sha512-QfpvxFsMORwKpvnLslkHCr3NTCczHAvkte6+pQGsiUZXKBe6mO4TTb727b+9KMVSK6XZqhR6ZwImKdP+F5vS6A== ->>>>>>> 63f4e38f6554c78376d1541f9188cd4d5319e87f dependencies: "@wdio/logger" "^8.24.12" decamelize "^6.0.0" From eef1afcd59334e94e8ef3a99b62176099125e336 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Sat, 23 Dec 2023 01:28:35 +0100 Subject: [PATCH 18/21] fix sassOptions --- x-pack/plugins/canvas/shareable_runtime/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js index ccc04a846236..31330172cc67 100644 --- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js +++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js @@ -150,7 +150,7 @@ module.exports = { implementation: require('sass-embedded'), webpackImporter: false, sassOptions: { - outputStyle: 'nested', + outputStyle: 'expanded', includePaths: [path.resolve(KIBANA_ROOT, 'node_modules')], }, }, From ebdf24ad126439f35a15376e8acd7f3c0a27d1a9 Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Wed, 27 Dec 2023 00:31:45 +0100 Subject: [PATCH 19/21] test --- .../canvas/shareable_runtime/webpack.config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js index 31330172cc67..25ccfefcf127 100644 --- a/x-pack/plugins/canvas/shareable_runtime/webpack.config.js +++ b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js @@ -141,12 +141,12 @@ 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: { From 093ec2e19db1a114867b2acc157df23062489f2e Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Wed, 27 Dec 2023 11:36:40 +0100 Subject: [PATCH 20/21] 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 25ccfefcf127..e3786b937ea6 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')], From ffaae42828d0d718e29dce4c6361b8b2456762de Mon Sep 17 00:00:00 2001 From: Patryk Kopycinski Date: Wed, 27 Dec 2023 15:05:23 +0100 Subject: [PATCH 21/21] update sass-loader --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ca62724e8810..44bc7e1ac5c3 100644 --- a/package.json +++ b/package.json @@ -1625,7 +1625,7 @@ "resolve": "^1.22.0", "rxjs-marbles": "^7.0.1", "sass-embedded": "^1.69.5", - "sass-loader": "^10.5.0", + "sass-loader": "^10.5.1", "selenium-webdriver": "^4.16.0", "simple-git": "^3.16.0", "sinon": "^7.4.2", diff --git a/yarn.lock b/yarn.lock index 1dd03381e554..eccede444bc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26826,10 +26826,10 @@ sass-embedded@^1.69.5: sass-embedded-win32-ia32 "1.69.5" sass-embedded-win32-x64 "1.69.5" -sass-loader@^10.5.0: - version "10.5.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.5.0.tgz#011c92ea529029e296aea37508e034b94f7dd2dc" - integrity sha512-VsU71W7VR6SChMJZUqtrfLeMSA8ns7QTHbnA7cfevtjb3c392mX93lr0Dmr4uU1ch5uIbEmfmHjdrDYcXXkQ7w== +sass-loader@^10.5.1: + version "10.5.1" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.5.1.tgz#4cfb9cd17e09afc7d8787fdb57d665254c3aadcb" + integrity sha512-P8BGIW6OxYLJWaWG8DROibc98Uw/B90oHPYOjPQ5/tF572OTTwkhxSxpaQzD5lYam36zQd0cxjh24b4rcdNIZQ== dependencies: klona "^2.0.4" loader-utils "^2.0.0"