Skip to content

fix: Use caret dependency range for Griffel #23754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ling1726 merged 7 commits into from
Jun 28, 2022
Merged

fix: Use caret dependency range for Griffel #23754

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ae83b69
fix: Use caret dependency range for Griffel
ling1726 Jun 28, 2022
c6fef38
changefile
ling1726 Jun 28, 2022
be184bf
update yarn.lock
ling1726 Jun 28, 2022
a9e0a68
merge master
ling1726 Jun 28, 2022
fe91c4b
use griffel core 1.4.1
ling1726 Jun 28, 2022
d1d6740
fix satisfied
ling1726 Jun 28, 2022
cc06e4e
dedupe babel-preset
ling1726 Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/perf-test-react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@fluentui/eslint-plugin": "*"
},
"dependencies": {
"@griffel/core": "1.4.0",
"@griffel/core": "^1.4.0",
"@fluentui/react-avatar": "^9.0.0",
"@fluentui/react-button": "^9.0.0",
"@fluentui/react-provider": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/public-docsite-v9/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@fluentui/react-components": "^9.0.0",
"@fluentui/react-storybook-addon": "^9.0.0-rc.1",
"@fluentui/react-theme": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"react": "16.14.0",
"react-dom": "16.14.0",
"tslib": "^2.1.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/vr-tests-react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@fluentui/react-tooltip": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@fluentui/scripts": "^1.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"react": "16.14.0",
"react-dom": "16.14.0",
"screener-storybook": "0.23.0",
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-react-accordion-7710de28-c349-4f7b-bf38-a3bc11b2912f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-accordion",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-alert-a18fccea-a81e-4728-9ab0-166894afdc03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-alert",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-avatar-98ed0e08-9889-47fa-98c1-6c9656313588.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-avatar",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-badge-ada58b0f-57d5-4d9d-b4fc-95942c53e990.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-badge",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-button-80dd00b7-6dd8-4703-9ead-bc43a35e70b2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-button",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-card-1f90e6a3-b898-40b6-a8e3-8ca480082b4a.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-card",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-checkbox-eef0a681-9774-4dd0-aef7-b3cbc168c909.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-checkbox",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-combobox-53297433-905e-4ac4-aa45-b49b9d68606b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-combobox",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-components-5ad0b4c3-a290-4dd6-b8e9-dffcfc649bc9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-components",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-conformance-griffel-ece356f4-f18d-41f9-9d69-a023207b9c56.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-conformance-griffel",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-divider-87bbc57f-d78e-4a44-ba7d-72de053e3ee3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-divider",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-image-0fcbb6d1-ffb6-4069-ae61-785516f42233.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-image",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-input-347299b7-25e0-42cc-a07d-30e22f17d505.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-input",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-label-24d5294c-7a13-4a11-ae71-83e66d5ffe2e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-label",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-link-3b15d0f1-c8bc-4789-924e-0531e1294774.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-link",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-menu-b6971d91-3251-40c3-adbf-d43e11d71b17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-menu",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-overflow-d98fee3a-f009-4e5b-a9f7-d5dad771d46e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-overflow",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-popover-9052160d-a183-4e8d-b061-939a775acd8c.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-popover",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-portal-3a9be4ee-b962-4d64-8458-2a8c3f5f0572.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-portal",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-positioning-5abde6b8-9a46-4cd4-a859-478944a68daf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-positioning",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-provider-1cecebf1-f38d-4a05-aaac-6b801bfca83b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-provider",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-radio-dc520c7b-4965-4cb0-b48e-e6c9f26a1e86.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-radio",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-select-e6a1d2ce-1d6a-4395-89a4-16c069340791.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-select",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-slider-28e8e63e-7d3c-4cbe-8a1b-db68c7ef36ee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-slider",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-spinbutton-b2657bbf-1dac-4ea4-987a-dcb43c83a786.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-spinbutton",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-spinner-b513979b-172c-40de-b458-d9f914fabffc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-spinner",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-switch-6ea8c84d-e11b-4eb7-b2df-617e317cae78.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-switch",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-tabs-9fdcb562-0b39-45a8-a167-f4b06f768612.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-tabs",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-tabster-5a02efc7-6c09-403b-baf3-d951b552ee7f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-tabster",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-text-5b3ba96e-79e9-41a9-9d7d-23daba05c96d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-text",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-textarea-62f0eaed-4ac9-418b-bc7c-0c6a3670eb88.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-textarea",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-toolbar-09ca9012-7f88-49f2-9c46-ff535edea538.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-toolbar",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-tooltip-4a8fee77-8272-49d1-86cf-d844a1881932.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Use caret dependency range for Griffel",
"packageName": "@fluentui/react-tooltip",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
"@cypress/react": "5.12.4",
"@cypress/webpack-dev-server": "1.8.3",
"@fluentui/react-icons": "^2.0.172-rc.8",
"@griffel/babel-preset": "1.3.2",
"@griffel/babel-preset": "^1.3.2",
"@griffel/eslint-plugin": "1.0.0",
"@griffel/jest-serializer": "1.0.5",
"@griffel/react": "1.2.0",
"@griffel/webpack-loader": "2.0.7",
"@griffel/jest-serializer": "^1.0.5",
"@griffel/react": "^1.2.0",
"@griffel/webpack-loader": "^2.0.7",
"@microsoft/api-extractor": "7.18.1",
"@microsoft/eslint-plugin-sdl": "0.1.9",
"@nrwl/cli": "13.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-accordion/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@fluentui/react-tabster": "^9.0.0",
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-alert/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@fluentui/react-icons": "^2.0.172-rc.8",
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-avatar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-tooltip": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-badge/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"dependencies": {
"@fluentui/react-icons": "^2.0.172-rc.8",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"tslib": "^2.1.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-button/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@fluentui/react-tabster": "^9.0.0",
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-card/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@fluentui/react-button": "^9.0.0"
},
"dependencies": {
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"@fluentui/react-utilities": "^9.0.0",
"@fluentui/react-tabster": "^9.0.0",
"@fluentui/react-theme": "^9.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-checkbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@fluentui/react-tabster": "^9.0.0",
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-combobox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@fluentui/react-positioning": "^9.0.0",
"@fluentui/react-theme": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@fluentui/react-tooltip": "^9.0.0",
"@fluentui/react-utilities": "^9.0.0",
"@fluentui/react-text": "^9.0.0",
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-conformance-griffel/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@fluentui/react-conformance": "^0.13.1"
},
"dependencies": {
"@griffel/react": "1.2.0",
"@griffel/react": "^1.2.0",
"tslib": "^2.1.0"
},
"beachball": {
Expand Down
Loading