Skip to content

Commit 14af611

Browse files
tkajtochtkajtoch
committed
fix: apply resolutions field on the workspace level instead of inaccurately on package level
1 parent d7ba28c commit 14af611

3 files changed

Lines changed: 33 additions & 54 deletions

File tree

‎package.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,11 @@
1818
],
1919
"devDependencies": {
2020
"pre-push": "^0.1.4"
21+
},
22+
"resolutions": {
23+
"**/prismjs": "1.27.0",
24+
"**/react": "^18",
25+
"**/@types/react": "^18",
26+
"react-focus-lock": "^2.9.5"
2127
}
2228
}

‎packages/eui/package.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@
5050
"type": "git",
5151
"url": "https://github.com/elastic/eui.git"
5252
},
53-
"resolutions": {
54-
"**/prismjs": "1.27.0",
55-
"**/react": "^18",
56-
"**/@types/react": "^18",
57-
"react-focus-lock": "^2.9.5"
58-
},
5953
"dependencies": {
6054
"@hello-pangea/dnd": "^16.6.0",
6155
"@types/lodash": "^4.14.202",

‎yarn.lock‎

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5342,22 +5342,12 @@
53425342
dependencies:
53435343
"@types/react" "*"
53445344

5345-
"@types/react@*", "@types/react@>=16.9.0", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^18.2.14":
5346-
version "18.2.14"
5347-
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.14.tgz#fa7a6fecf1ce35ca94e74874f70c56ce88f7a127"
5348-
integrity sha512-A0zjq+QN/O0Kpe30hA1GidzyFjatVvrpIvWLxD+xv67Vt91TWWgco9IvrJBkeyHm1trGaFS/FSGqPlhyeZRm0g==
5345+
"@types/react@*", "@types/react@>=16.9.0", "@types/react@^16", "@types/react@^16.8.0 || ^17.0.0 || ^18.0.0", "@types/react@^18", "@types/react@^18.2.14":
5346+
version "18.3.1"
5347+
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.1.tgz#fed43985caa834a2084d002e4771e15dfcbdbe8e"
5348+
integrity sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==
53495349
dependencies:
53505350
"@types/prop-types" "*"
5351-
"@types/scheduler" "*"
5352-
csstype "^3.0.2"
5353-
5354-
"@types/react@^16":
5355-
version "16.14.60"
5356-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.60.tgz#f7ab62a329b82826f12d02bc8031d4ef4b5e0d81"
5357-
integrity sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg==
5358-
dependencies:
5359-
"@types/prop-types" "*"
5360-
"@types/scheduler" "^0.16"
53615351
csstype "^3.0.2"
53625352

53635353
"@types/refractor@^3.4.0":
@@ -5384,16 +5374,6 @@
53845374
resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
53855375
integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
53865376

5387-
"@types/scheduler@*":
5388-
version "0.16.2"
5389-
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
5390-
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
5391-
5392-
"@types/scheduler@^0.16":
5393-
version "0.16.8"
5394-
resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff"
5395-
integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==
5396-
53975377
"@types/semver@^7.3.12", "@types/semver@^7.3.4":
53985378
version "7.5.0"
53995379
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
@@ -11643,10 +11623,10 @@ flush-write-stream@^1.0.0:
1164311623
inherits "^2.0.1"
1164411624
readable-stream "^2.0.4"
1164511625

11646-
focus-lock@^0.11.6:
11647-
version "0.11.6"
11648-
resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.11.6.tgz#e8821e21d218f03e100f7dc27b733f9c4f61e683"
11649-
integrity sha512-KSuV3ur4gf2KqMNoZx3nXNVhqCkn42GuTYCX4tXPEwf0MjpFQmNMiN6m7dXaUXgIoivL6/65agoUMg4RLS0Vbg==
11626+
focus-lock@^1.3.5:
11627+
version "1.3.5"
11628+
resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-1.3.5.tgz#aa644576e5ec47d227b57eb14e1efb2abf33914c"
11629+
integrity sha512-QFaHbhv9WPUeLYBDe/PAuLKJ4Dd9OPvKs9xZBr3yLXnUrDNaVXKu2baDBXe3naPY30hgHYSsf2JW4jzas2mDEQ==
1165011630
dependencies:
1165111631
tslib "^2.0.3"
1165211632

@@ -18544,7 +18524,7 @@ prism-react-renderer@^1.2.0:
1854418524
resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.5.tgz#786bb69aa6f73c32ba1ee813fbe17a0115435085"
1854518525
integrity sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg==
1854618526

18547-
prismjs@~1.27.0:
18527+
prismjs@1.27.0, prismjs@~1.27.0:
1854818528
version "1.27.0"
1854918529
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
1855018530
integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
@@ -19030,16 +19010,16 @@ react-fast-compare@^3.1.1:
1903019010
resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
1903119011
integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
1903219012

19033-
react-focus-lock@^2.9.4:
19034-
version "2.9.5"
19035-
resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.9.5.tgz#8a82f4f0128cccc27b9e77a4472e8a22f1b52189"
19036-
integrity sha512-h6vrdgUbsH2HeD5I7I3Cx1PPrmwGuKYICS+kB9m+32X/9xHRrAbxgvaBpG7BFBN9h3tO+C3qX1QAVESmi4CiIA==
19013+
react-focus-lock@^2.9.4, react-focus-lock@^2.9.5:
19014+
version "2.12.1"
19015+
resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.12.1.tgz#0eaefd5fc34de8998967043d902e426352393349"
19016+
integrity sha512-lfp8Dve4yJagkHiFrC1bGtib3mF2ktqwPJw4/WGcgPW+pJ/AVQA5X2vI7xgp13FcxFEpYBBHpXai/N2DBNC0Jw==
1903719017
dependencies:
1903819018
"@babel/runtime" "^7.0.0"
19039-
focus-lock "^0.11.6"
19019+
focus-lock "^1.3.5"
1904019020
prop-types "^15.6.2"
1904119021
react-clientside-effect "^1.2.6"
19042-
use-callback-ref "^1.3.0"
19022+
use-callback-ref "^1.3.2"
1904319023
use-sidecar "^1.1.2"
1904419024

1904519025
react-focus-on@^3.9.1:
@@ -19270,21 +19250,13 @@ react-window@^1.8.10:
1927019250
"@babel/runtime" "^7.0.0"
1927119251
memoize-one ">=3.1.1 <6"
1927219252

19273-
"react@^16.8.0 || ^17.0.0 || ^18.0.0", react@^18.2.0:
19274-
version "18.2.0"
19275-
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
19276-
integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
19253+
"react@^16.8.0 || ^17.0.0 || ^18.0.0", react@^17.0.2, react@^18, react@^18.2.0:
19254+
version "18.3.1"
19255+
resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
19256+
integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
1927719257
dependencies:
1927819258
loose-envify "^1.1.0"
1927919259

19280-
react@^17.0.2:
19281-
version "17.0.2"
19282-
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
19283-
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
19284-
dependencies:
19285-
loose-envify "^1.1.0"
19286-
object-assign "^4.1.1"
19287-
1928819260
read-cache@^1.0.0:
1928919261
version "1.0.0"
1929019262
resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -22866,6 +22838,13 @@ use-callback-ref@^1.3.0:
2286622838
dependencies:
2286722839
tslib "^2.0.0"
2286822840

22841+
use-callback-ref@^1.3.2:
22842+
version "1.3.2"
22843+
resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.2.tgz#6134c7f6ff76e2be0b56c809b17a650c942b1693"
22844+
integrity sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==
22845+
dependencies:
22846+
tslib "^2.0.0"
22847+
2286922848
use-memo-one@^1.1.3:
2287022849
version "1.1.3"
2287122850
resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99"
@@ -23496,7 +23475,7 @@ which-typed-array@^1.1.2, which-typed-array@^1.1.9:
2349623475
which@1.2.x:
2349723476
version "1.2.14"
2349823477
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
23499-
integrity sha512-16uPglFkRPzgiUXYMi1Jf8Z5EzN1iB4V0ZtMXcHZnwsBtQhhHeCqoWw7tsUY42hJGNDWtUsVLTjakIa5BgAxCw==
23478+
integrity sha1-mofEN48D6CfOyvGs31bHNsAcFOU=
2350023479
dependencies:
2350123480
isexe "^2.0.0"
2350223481

0 commit comments

Comments
 (0)