Skip to content

Commit fcfbda8

Browse files
committed
fix: restore dependencies dropped during merge conflict resolution
- chart-web-components: @microsoft/fast-web-utilities - recipes: @fluentui/react-icons - react-docsite-components: @fluentui/theme, @microsoft/load-themed-styles - react-monaco-editor: @fluentui/react, @microsoft/load-themed-styles
1 parent 5cc33a7 commit fcfbda8

5 files changed

Lines changed: 28 additions & 0 deletions

File tree

packages/charts/chart-web-components/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"dependencies": {
7070
"@fluentui/tokens": "^1.0.0-alpha.23",
7171
"@fluentui/web-components": "^3.0.0-rc.22",
72+
"@microsoft/fast-web-utilities": "^6.0.0",
7273
"@types/d3-selection": "^3.0.0",
7374
"@types/d3-shape": "^3.0.0",
7475
"d3-selection": "^3.0.0",

packages/react-components/recipes/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
},
2020
"license": "MIT",
2121
"dependencies": {
22+
"@fluentui/react-icons": "^2.0.245",
2223
"@fluentui/react-provider": "^9.22.17",
2324
"@fluentui/react-text": "^9.6.17",
2425
"@fluentui/react-theme": "^9.2.1",

packages/react-docsite-components/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
"@fluentui/react-hooks": "^8.10.2",
3333
"@fluentui/react-monaco-editor": "^1.8.10",
3434
"@fluentui/set-version": "^8.2.24",
35+
"@fluentui/theme": "^2.7.2",
36+
"@microsoft/load-themed-styles": "^1.10.26",
3537
"color-check": "0.0.2",
3638
"markdown-to-jsx": "^7.0.0",
3739
"office-ui-fabric-core": "^11.0.0",

packages/react-monaco-editor/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
"dependencies": {
2222
"@fluentui/example-data": "^8.4.25",
2323
"@fluentui/monaco-editor": "^1.3.24",
24+
"@fluentui/react": "^8.125.6",
2425
"@fluentui/react-charting": "^5.25.10",
2526
"@fluentui/react-hooks": "^8.10.2",
27+
"@microsoft/load-themed-styles": "^1.10.26",
2628
"raw-loader": "4.0.2",
2729
"react-syntax-highlighter": "^10.1.3",
2830
"tslib": "^2.1.0"

yarn.lock

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2635,6 +2635,7 @@ __metadata:
26352635
dependencies:
26362636
"@fluentui/tokens": "npm:^1.0.0-alpha.23"
26372637
"@fluentui/web-components": "npm:^3.0.0-rc.22"
2638+
"@microsoft/fast-web-utilities": "npm:^6.0.0"
26382639
"@storybook/html": "npm:9.1.17"
26392640
"@storybook/html-vite": "npm:9.1.17"
26402641
"@tensile-perf/web-components": "npm:~0.2.2"
@@ -4153,6 +4154,8 @@ __metadata:
41534154
"@fluentui/react-hooks": "npm:^8.10.2"
41544155
"@fluentui/react-monaco-editor": "npm:^1.8.10"
41554156
"@fluentui/set-version": "npm:^8.2.24"
4157+
"@fluentui/theme": "npm:^2.7.2"
4158+
"@microsoft/load-themed-styles": "npm:^1.10.26"
41564159
"@types/color-check": "npm:0.0.0"
41574160
"@types/react-custom-scrollbars": "npm:^4.0.5"
41584161
color-check: "npm:0.0.2"
@@ -4852,8 +4855,10 @@ __metadata:
48524855
dependencies:
48534856
"@fluentui/example-data": "npm:^8.4.25"
48544857
"@fluentui/monaco-editor": "npm:^1.3.24"
4858+
"@fluentui/react": "npm:^8.125.6"
48554859
"@fluentui/react-charting": "npm:^5.25.10"
48564860
"@fluentui/react-hooks": "npm:^8.10.2"
4861+
"@microsoft/load-themed-styles": "npm:^1.10.26"
48574862
"@types/react-syntax-highlighter": "npm:^10.2.1"
48584863
raw-loader: "npm:4.0.2"
48594864
react-syntax-highlighter: "npm:^10.1.3"
@@ -6059,6 +6064,7 @@ __metadata:
60596064
version: 0.0.0-use.local
60606065
resolution: "@fluentui/recipes@workspace:packages/react-components/recipes"
60616066
dependencies:
6067+
"@fluentui/react-icons": "npm:^2.0.245"
60626068
"@fluentui/react-provider": "npm:^9.22.17"
60636069
"@fluentui/react-text": "npm:^9.6.17"
60646070
"@fluentui/react-theme": "npm:^9.2.1"
@@ -7677,6 +7683,15 @@ __metadata:
76777683
languageName: node
76787684
linkType: hard
76797685

7686+
"@microsoft/fast-web-utilities@npm:^6.0.0":
7687+
version: 6.0.0
7688+
resolution: "@microsoft/fast-web-utilities@npm:6.0.0"
7689+
dependencies:
7690+
exenv-es6: "npm:^1.1.1"
7691+
checksum: 10c0/e4eeee3910f9e4776b4134050bc8073c35e5fb7381a3f6a171a9cec71db2f7966118b28015a4a7e27d84afb6cdfdfd378f7931072eb4e0e3135900d03f6833cc
7692+
languageName: node
7693+
linkType: hard
7694+
76807695
"@microsoft/focusgroup-polyfill@npm:1.5.0":
76817696
version: 1.5.0
76827697
resolution: "@microsoft/focusgroup-polyfill@npm:1.5.0"
@@ -17637,6 +17652,13 @@ __metadata:
1763717652
languageName: node
1763817653
linkType: hard
1763917654

17655+
"exenv-es6@npm:^1.1.1":
17656+
version: 1.1.1
17657+
resolution: "exenv-es6@npm:1.1.1"
17658+
checksum: 10c0/66e70b0ceffba2c720fcd4342002c4d3f6908deea7012ca612c97ad115b7cbb2d39030626947883aafd5f05488d32362485934444906db08502bb6c8ada6e130
17659+
languageName: node
17660+
linkType: hard
17661+
1764017662
"exit-x@npm:^0.2.2":
1764117663
version: 0.2.2
1764217664
resolution: "exit-x@npm:0.2.2"

0 commit comments

Comments
 (0)