Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak committed Sep 14, 2023
2 parents 31295b9 + 41bdcb7 commit c7f3774
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
4 changes: 2 additions & 2 deletions packages/mui-styled-engine-sc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
"dependencies": {
"@babel/runtime": "^7.22.15",
"csstype": "^3.1.2",
"prop-types": "^15.8.1",
"react": "^18.2.0"
"prop-types": "^15.8.1"
},
"devDependencies": {
"@mui/styled-engine-sc": "workspace:*",
Expand All @@ -50,6 +49,7 @@
"@types/styled-components": "^5.1.26",
"chai": "^4.3.7",
"styled-components": "^5.3.1",
"react": "^18.2.0",
"test": "workspace:^"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-styled-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"@babel/runtime": "^7.22.15",
"@emotion/cache": "^11.11.0",
"csstype": "^3.1.2",
"prop-types": "^15.8.1",
"react": "^18.2.0"
"prop-types": "^15.8.1"
},
"devDependencies": {
"@emotion/react": "^11.11.1",
Expand All @@ -51,6 +50,7 @@
"@types/chai": "^4.3.5",
"@types/react": "^18.2.21",
"chai": "^4.3.7",
"react": "^18.2.0",
"test": "workspace:^"
},
"peerDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/mui-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@
},
"peerDependencies": {
"@types/react": "^17.0.0 || ^18.0.0",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
"react": "^17.0.0 || ^18.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c7f3774

Please sign in to comment.