Skip to content

Commit e1bf05b

Browse files
authored
Merge branch 'spectrum-two' into aramos-adobe/css769-combox-s2-migration
2 parents 3daface + 3682b76 commit e1bf05b

File tree

3 files changed

+51
-26
lines changed

3 files changed

+51
-26
lines changed

.storybook/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@spectrum-css/ui-icons": "2.0.0-next.0"
4646
},
4747
"devDependencies": {
48-
"@babel/core": "^7.27.3",
48+
"@babel/core": "^7.27.4",
4949
"@chromatic-com/storybook": "^3.2.6",
5050
"@etchteam/storybook-addon-status": "^5.0.0",
5151
"@storybook/addon-a11y": "8.4.7",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"diff2html": "^3.4.51",
8484
"eslint": "^8.57.1",
8585
"eslint-plugin-jsonc": "^2.20.1",
86-
"eslint-plugin-prettier": "^5.4.0",
86+
"eslint-plugin-prettier": "^5.4.1",
8787
"fast-glob": "^3.3.3",
8888
"gh-pages": "^6.3.0",
8989
"husky": "^9.1.7",

yarn.lock

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ __metadata:
137137
diff2html: "npm:^3.4.51"
138138
eslint: "npm:^8.57.1"
139139
eslint-plugin-jsonc: "npm:^2.20.1"
140-
eslint-plugin-prettier: "npm:^5.4.0"
140+
eslint-plugin-prettier: "npm:^5.4.1"
141141
fast-glob: "npm:^3.3.3"
142142
gh-pages: "npm:^6.3.0"
143143
husky: "npm:^9.1.7"
@@ -437,26 +437,26 @@ __metadata:
437437
languageName: node
438438
linkType: hard
439439

440-
"@babel/core@npm:^7.27.3":
441-
version: 7.27.3
442-
resolution: "@babel/core@npm:7.27.3"
440+
"@babel/core@npm:^7.27.4":
441+
version: 7.27.4
442+
resolution: "@babel/core@npm:7.27.4"
443443
dependencies:
444444
"@ampproject/remapping": "npm:^2.2.0"
445445
"@babel/code-frame": "npm:^7.27.1"
446446
"@babel/generator": "npm:^7.27.3"
447447
"@babel/helper-compilation-targets": "npm:^7.27.2"
448448
"@babel/helper-module-transforms": "npm:^7.27.3"
449-
"@babel/helpers": "npm:^7.27.3"
450-
"@babel/parser": "npm:^7.27.3"
449+
"@babel/helpers": "npm:^7.27.4"
450+
"@babel/parser": "npm:^7.27.4"
451451
"@babel/template": "npm:^7.27.2"
452-
"@babel/traverse": "npm:^7.27.3"
452+
"@babel/traverse": "npm:^7.27.4"
453453
"@babel/types": "npm:^7.27.3"
454454
convert-source-map: "npm:^2.0.0"
455455
debug: "npm:^4.1.0"
456456
gensync: "npm:^1.0.0-beta.2"
457457
json5: "npm:^2.2.3"
458458
semver: "npm:^6.3.1"
459-
checksum: 10c0/c6ada8f64d238f1cc166e21e5d056f96e976fc5132cc6f4ebaf5369bc5b1c62bc802756feed15240e0e8448a9a9434796b11af2f304b5aa3781f125b4928a6ba
459+
checksum: 10c0/d2d17b106a8d91d3eda754bb3f26b53a12eb7646df73c2b2d2e9b08d90529186bc69e3823f70a96ec6e5719dc2372fb54e14ad499da47ceeb172d2f7008787b5
460460
languageName: node
461461
linkType: hard
462462

@@ -614,13 +614,13 @@ __metadata:
614614
languageName: node
615615
linkType: hard
616616

617-
"@babel/helpers@npm:^7.27.3":
618-
version: 7.27.3
619-
resolution: "@babel/helpers@npm:7.27.3"
617+
"@babel/helpers@npm:^7.27.4":
618+
version: 7.27.4
619+
resolution: "@babel/helpers@npm:7.27.4"
620620
dependencies:
621621
"@babel/template": "npm:^7.27.2"
622622
"@babel/types": "npm:^7.27.3"
623-
checksum: 10c0/b6c9a5bddcda88e39e87b15d7fed592828ed9b7b75e055bbc00212bbff2ba78d00d26358fbe878d7a052aebd3c33d39882b9e7f2ea9865180897b18efdfaf739
623+
checksum: 10c0/3463551420926b3f403c1a30d66ac67bba5c4f73539a8ccb71544da129c4709ac37c57fac740ed8a261b3e6bbbf353b05e03b36ea1a6bf1081604b2a94ca43c1
624624
languageName: node
625625
linkType: hard
626626

@@ -677,6 +677,17 @@ __metadata:
677677
languageName: node
678678
linkType: hard
679679

680+
"@babel/parser@npm:^7.27.4":
681+
version: 7.27.4
682+
resolution: "@babel/parser@npm:7.27.4"
683+
dependencies:
684+
"@babel/types": "npm:^7.27.3"
685+
bin:
686+
parser: ./bin/babel-parser.js
687+
checksum: 10c0/d1bf17e7508585235e2a76594ba81828e48851877112bb8abbecd7161a31fb66654e993e458ddaedb18a3d5fa31970e5f3feca5ae2900f51e6d8d3d35da70dbf
688+
languageName: node
689+
linkType: hard
690+
680691
"@babel/plugin-syntax-async-generators@npm:^7.8.4":
681692
version: 7.8.4
682693
resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
@@ -925,6 +936,21 @@ __metadata:
925936
languageName: node
926937
linkType: hard
927938

939+
"@babel/traverse@npm:^7.27.4":
940+
version: 7.27.4
941+
resolution: "@babel/traverse@npm:7.27.4"
942+
dependencies:
943+
"@babel/code-frame": "npm:^7.27.1"
944+
"@babel/generator": "npm:^7.27.3"
945+
"@babel/parser": "npm:^7.27.4"
946+
"@babel/template": "npm:^7.27.2"
947+
"@babel/types": "npm:^7.27.3"
948+
debug: "npm:^4.3.1"
949+
globals: "npm:^11.1.0"
950+
checksum: 10c0/6de8aa2a0637a6ee6d205bf48b9e923928a02415771fdec60085ed754dcdf605e450bb3315c2552fa51c31a4662275b45d5ae4ad527ce55a7db9acebdbbbb8ed
951+
languageName: node
952+
linkType: hard
953+
928954
"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.8.3":
929955
version: 7.24.9
930956
resolution: "@babel/types@npm:7.24.9"
@@ -5235,7 +5261,7 @@ __metadata:
52355261
resolution: "@spectrum-css/preview@workspace:.storybook"
52365262
dependencies:
52375263
"@adobe/spectrum-css-workflow-icons": "npm:^4.1.0"
5238-
"@babel/core": "npm:^7.27.3"
5264+
"@babel/core": "npm:^7.27.4"
52395265
"@chromatic-com/storybook": "npm:^3.2.6"
52405266
"@etchteam/storybook-addon-status": "npm:^5.0.0"
52415267
"@spectrum-css/bundle": "npm:1.0.1"
@@ -10485,12 +10511,12 @@ __metadata:
1048510511
languageName: node
1048610512
linkType: hard
1048710513

10488-
"eslint-plugin-prettier@npm:^5.4.0":
10489-
version: 5.4.0
10490-
resolution: "eslint-plugin-prettier@npm:5.4.0"
10514+
"eslint-plugin-prettier@npm:^5.4.1":
10515+
version: 5.4.1
10516+
resolution: "eslint-plugin-prettier@npm:5.4.1"
1049110517
dependencies:
1049210518
prettier-linter-helpers: "npm:^1.0.0"
10493-
synckit: "npm:^0.11.0"
10519+
synckit: "npm:^0.11.7"
1049410520
peerDependencies:
1049510521
"@types/eslint": ">=8.0.0"
1049610522
eslint: ">=8.0.0"
@@ -10501,7 +10527,7 @@ __metadata:
1050110527
optional: true
1050210528
eslint-config-prettier:
1050310529
optional: true
10504-
checksum: 10c0/50718d16266dfbe6909697f9d7c9188d2664f5be50fa1de4decc0c8236565570823fdf5973f89cd51254af5551b6160650e092716002a62aaa0f0b2c18e8fc3e
10530+
checksum: 10c0/bdd9e9473bf3f995521558eb5e2ee70dd4f06cb8b9a6192523cfed76511924fad31ec9af9807cd99f693dc59085e0a1db8a1d3ccc283e98ab30eb32cc7469649
1050510531
languageName: node
1050610532
linkType: hard
1050710533

@@ -19568,13 +19594,12 @@ __metadata:
1956819594
languageName: node
1956919595
linkType: hard
1957019596

19571-
"synckit@npm:^0.11.0":
19572-
version: 0.11.5
19573-
resolution: "synckit@npm:0.11.5"
19597+
"synckit@npm:^0.11.7":
19598+
version: 0.11.8
19599+
resolution: "synckit@npm:0.11.8"
1957419600
dependencies:
1957519601
"@pkgr/core": "npm:^0.2.4"
19576-
tslib: "npm:^2.8.1"
19577-
checksum: 10c0/49cbd90c3f0ebe7ea6af2fe359e93ef737983b9aaaa605d63c3bf6ba7b31fd2d201e0d8c09f099a11d5ed2d5a7bf3a2ee865708f7f6795646317aac1266517aa
19602+
checksum: 10c0/a1de5131ee527512afcaafceb2399b2f3e63678e56b831e1cb2dc7019c972a8b654703a3b94ef4166868f87eb984ea252b467c9d9e486b018ec2e6a55c24dfd8
1957819603
languageName: node
1957919604
linkType: hard
1958019605

@@ -19909,7 +19934,7 @@ __metadata:
1990919934
languageName: node
1991019935
linkType: hard
1991119936

19912-
"tslib@npm:^2.0.0, tslib@npm:^2.8.1":
19937+
"tslib@npm:^2.0.0":
1991319938
version: 2.8.1
1991419939
resolution: "tslib@npm:2.8.1"
1991519940
checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62

0 commit comments

Comments
 (0)