From 0f07baf6b2c07bccd6ec7356990023d89d7b57b8 Mon Sep 17 00:00:00 2001
From: Andrey Myssak <andreymyssak@gmail.com>
Date: Thu, 13 Jul 2023 19:33:22 +0600
Subject: [PATCH] Adjust resolutions (#584)

Co-authored-by: Sergey Myssak <sergey.myssak@gmail.com>
Signed-off-by: Andrey Myssak <andreymyssak@gmail.com>
---
 package.json                                  | 18 -------------
 .../src/views/combo_box/combo_box_example.js  |  6 ++---
 yarn.lock                                     | 27 +++----------------
 3 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index fb17451706..c2296054e1 100644
--- a/package.json
+++ b/package.json
@@ -45,29 +45,16 @@
   },
   "resolutions": {
     "**/semver": "^7.5.3",
-    "@babel/cli/**/ansi-regex": "^5.0.1",
-    "@babel/cli/**/minimist": "^1.2.6",
-    "@babel/cli/chokidar/glob-parent": "^6.0.1",
     "@elastic/charts/**/d3-color": "^3.1.0",
     "@types/jest/**/ansi-regex": "^5.0.1",
-    "babel-plugin-add-module-exports/chokidar/glob-parent": "^6.0.1",
-    "babel-plugin-inline-react-svg/**/ansi-regex": "^5.0.1",
-    "babel-plugin-inline-react-svg/svgo/js-yaml": "^3.13.1",
-    "babel-template/**/ansi-regex": "^5.0.1",
     "codesandbox/**/ansi-regex": "^5.0.1",
     "codesandbox/**/got": "^11.8.5",
     "codesandbox/axios": "^0.22.0",
     "codesandbox/pacote": "^12.0.0",
-    "cssnano/**/css-select/nth-check": "^2.0.1",
-    "cssnano/**/postcss": "^7.0.39",
     "enzyme/cheerio/cheerio-select-tmp/css-select/css-what": "^6.1.0",
     "enzyme/cheerio/cheerio-select-tmp/css-what": "^6.1.0",
-    "html-webpack-plugin/**/ansi-regex": "^5.0.1",
     "jest-cli/**/ansi-regex": "^5.0.1",
     "jest/**/node-notifier": "^10.0.1",
-    "node-sass/sass-graph/scss-tokenizer": "^0.4.3",
-    "postcss-cli/chokidar/glob-parent": "^6.0.1",
-    "postcss-inline-svg/css-select/nth-check": "^2.0.1",
     "react-view/**/ansi-regex": "^5.0.1",
     "react-view/**/minimist": "^1.2.6",
     "react-view/@miksu/prettier/minimatch": "^3.0.8",
@@ -79,11 +66,6 @@
     "sass-lint/front-matter": "^4.0.2",
     "sass-lint/merge": "^2.1.1",
     "start-server-and-test/**/minimist": "^1.2.6",
-    "webpack-dev-server/**/ansi-regex": "^5.0.1",
-    "webpack-dev-server/chokidar/glob-parent": "^6.0.1",
-    "webpack-dev-server/selfsigned": "^2.0.1",
-    "webpack/**/chokidar/glob-parent": "^6.0.1",
-    "webpack/terser-webpack-plugin/serialize-javascript": "^3.1.0",
     "yo/**/find-versions": "^4.0.0",
     "yo/**/got": "^11.8.5",
     "yo/meow": "^9.0.0"
diff --git a/src-docs/src/views/combo_box/combo_box_example.js b/src-docs/src/views/combo_box/combo_box_example.js
index bf4c6d4168..136b4b16da 100644
--- a/src-docs/src/views/combo_box/combo_box_example.js
+++ b/src-docs/src/views/combo_box/combo_box_example.js
@@ -183,7 +183,7 @@ const delimiterSnippet = `<OuiComboBox
 />`;
 
 import WithIcon from './combo_box_icon';
-const withIconSource = require('!!raw-loader!./combo_box_icon');
+const withIconSource = require('./combo_box_icon?raw');
 const withIconHtml = renderToHtml(WithIcon);
 const withIconSnippet = `<OuiComboBox
   placeholder="Select or create options"
@@ -231,7 +231,7 @@ const clearOnBlurSnippet = `<OuiComboBox
 />`;
 
 import ComboBoxDefaultIcon from './combo_box_default_icon';
-const comboBoxDefaultIconSource = require('!!raw-loader!./combo_box_default_icon');
+const comboBoxDefaultIconSource = require('./combo_box_default_icon?raw');
 const comboBoxDefaultIconSourceOptionsHtml = renderToHtml(ComboBoxDefaultIcon);
 const comboBoxDefaultIconSnippet = `<OuiComboBox
   placeholder="Select one or more options"
@@ -242,7 +242,7 @@ const comboBoxDefaultIconSnippet = `<OuiComboBox
 />`;
 
 import ComboBoxCustomIcon from './combo_box_custom_icon';
-const comboBoxCustomIconSource = require('!!raw-loader!./combo_box_custom_icon');
+const comboBoxCustomIconSource = require('./combo_box_custom_icon?raw');
 const comboBoxCustomIconSourceOptionsHtml = renderToHtml(ComboBoxCustomIcon);
 const comboBoxCustomIconSnippet = `<OuiComboBox
   placeholder="Select one or more options"
diff --git a/yarn.lock b/yarn.lock
index 4c7e224927..2bd04edf05 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7997,20 +7997,13 @@ github-username@^6.0.0:
   dependencies:
     "@octokit/rest" "^18.0.6"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.2:
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1, glob-parent@~5.1.0, glob-parent@~5.1.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -9380,13 +9373,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
 is-hexadecimal@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
@@ -13059,7 +13045,7 @@ postcss-values-parser@1.5.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.39, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.39"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
@@ -14751,7 +14737,7 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-selfsigned@^2.0.1, selfsigned@^2.1.1:
+selfsigned@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
   integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
@@ -14822,13 +14808,6 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
-serialize-javascript@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
-  dependencies:
-    randombytes "^2.1.0"
-
 serialize-javascript@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"