Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
elbakerino committed Dec 3, 2024
2 parents 47ffdc5 + c0bd39f commit 9d1f6f9
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 71 deletions.
42 changes: 23 additions & 19 deletions packages/demo/package-lock.json

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

12 changes: 6 additions & 6 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/lab": "^5.0.0-alpha.45",
"@ui-schema/dictionary": "~0.0.10",
"@ui-schema/ds-material": "~0.4.0-alpha.5",
"@ui-schema/material-color": "~0.4.0",
"@ui-schema/material-colorful": "~0.0.1",
"@ui-schema/ui-schema": "~0.4.1",
"immutable": "^4.0.0",
"@ui-schema/dictionary": "~0.0.13",
"@ui-schema/ds-material": "~0.4.3",
"@ui-schema/material-color": "~0.4.3",
"@ui-schema/material-colorful": "~0.0.4",
"@ui-schema/ui-schema": "~0.4.7",
"immutable": "^5.0.0",
"react": "^18.0",
"react-color": "^2.19.3",
"react-colorful": "^5.0.0",
Expand Down
39 changes: 21 additions & 18 deletions packages/material-color/package-lock.json

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

10 changes: 5 additions & 5 deletions packages/material-color/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui-schema/material-color",
"version": "0.4.2",
"version": "0.4.3",
"description": "React color pickers as MUI widgets for UI-Schema - using react-color.",
"homepage": "https://ui-schema.bemit.codes/docs/material-color/material-color",
"author": {
Expand Down Expand Up @@ -51,9 +51,9 @@
"@types/react-color": "^3.0.12",
"@mui/material": "^5.1",
"@mui/icons-material": "^5.1",
"@ui-schema/ds-material": "~0.4.0-alpha",
"@ui-schema/ui-schema": "~0.4.0-alpha",
"immutable": "^4.0.0",
"@ui-schema/ds-material": "~0.4.3",
"@ui-schema/ui-schema": "~0.4.7",
"immutable": "^5.0.0",
"react-color": "^2.0.0",
"react": "^18.0",
"react-dom": "^18.0"
Expand All @@ -63,7 +63,7 @@
"@mui/icons-material": "^5.1",
"@ui-schema/ds-material": "~0.4.0-alpha",
"@ui-schema/ui-schema": "~0.4.0-alpha",
"immutable": "^4.0.0",
"immutable": "^4.0.0 || ^5.0.0",
"react-color": "^2.0.0",
"@types/react-color": "^3.0.12",
"react": "^17.0 || ^18.0"
Expand Down
39 changes: 21 additions & 18 deletions packages/material-colorful/package-lock.json

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

10 changes: 5 additions & 5 deletions packages/material-colorful/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ui-schema/material-colorful",
"version": "0.0.3",
"version": "0.0.4",
"description": "React color pickers as MUI widgets for UI-Schema - using react-colorful.",
"homepage": "https://ui-schema.bemit.codes/docs/material-color/material-color",
"author": {
Expand Down Expand Up @@ -49,9 +49,9 @@
"@types/react": "^18.0",
"@mui/material": "^5.1",
"@mui/icons-material": "^5.1",
"@ui-schema/ds-material": "~0.4.0-alpha",
"@ui-schema/ui-schema": "~0.4.0-alpha",
"immutable": "^4.0.0",
"@ui-schema/ds-material": "~0.4.3",
"@ui-schema/ui-schema": "~0.4.7",
"immutable": "^5.0.0",
"react-colorful": "^5.0",
"react": "^18.0",
"react-dom": "^18.0"
Expand All @@ -61,7 +61,7 @@
"@mui/icons-material": "^5.1",
"@ui-schema/ds-material": "~0.4.0-alpha",
"@ui-schema/ui-schema": "~0.4.0-alpha",
"immutable": "^4.0.0",
"immutable": "^4.0.0 || ^5.0.0",
"react-colorful": "^5.0",
"react": "^17.0 || ^18.0"
},
Expand Down

0 comments on commit 9d1f6f9

Please sign in to comment.