Skip to content

Commit 80caa57

Browse files
committed
Merge branch 'develop'
2 parents 9d1f6f9 + 48e5371 commit 80caa57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+12182
-17908
lines changed

.eslintignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc

Lines changed: 0 additions & 162 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
blank_issues_enabled: true
22
contact_links:
3-
- name: UI-Schema Slack
4-
url: https://join.slack.com/t/ui-schema/shared_invite/zt-smbsybk5-dFIRLEPCJerzDwtycaA71w
5-
about: Ask questions and discuss in our Slack Community
6-
- name: Material-UI
3+
- name: UI-Schema Discord
4+
url: https://discord.gg/MAjgpwnm36
5+
about: Ask questions and discuss in our Discord Community
6+
- name: UI-Schema Core/Engine GitHub
7+
url: https://github.com/ui-schema/ui-schema
8+
about: "For questions and documentation of the core @ui-schema project."
9+
- name: Material-UI GitHub
710
url: https://github.com/mui-org/material-ui
8-
about: "When you got question not about the design-system bindings: docs + project of **Material-UI**"
11+
about: "Documentation and more for the design framework."

.github/workflows/blank.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
strategy:
2222
matrix:
23-
node-version: [ 18.x ]
23+
node-version: [ 24 ]
2424
steps:
2525
- uses: actions/checkout@v4
2626
- name: Set Branch
@@ -44,8 +44,6 @@ jobs:
4444
- name: Setup packages
4545
run: |
4646
npm ci
47-
npm run bootstrap
48-
npm run link
4947
5048
- name: Run tests
5149
run: |

CONTRIBUTING.md

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Contributing to UI-Schema
22

33
1. Fork/Clone repository **branch `develop`**
4-
2. Install root dev-dependencies (like lerna, webpack): `npm i`
5-
3. Install & link the `packages`: `npm run bootstrap && npm run link`
6-
4. Start dev-server: `npm start`
4+
2. Install dependencies (like lerna, webpack): `npm i`
5+
3. Start dev-server: `npm start`
76
- (will clean-dist + start demo app)
8-
5. Open browser on [localhost:4200](http://localhost:4204) for demo
9-
6. Explore [packages](packages)
10-
7. Code -> Commit -> Pull Request -> Being Awesome!
7+
4. Open browser on [localhost:4203](http://localhost:4203) for demo
8+
5. Explore [packages](packages) and there [demo/src/pages](packages/demo/src/pages)
9+
6. Code -> Commit -> Pull Request -> Being Awesome!
1110

1211
Changes from any package are reflected inside the demo package.
1312

@@ -20,22 +19,12 @@ Changes from any package are reflected inside the demo package.
2019
- with `--testPathPattern` to run all tests in a specific folder / path
2120
- `npm run tdd -- --testPathPattern=PatternValidator -t patternValidator` for only one test and often only one file
2221
- Testing: `npm test`
23-
- needs manual bootstrapping, linking and update handling
2422
- Build: `npm run build`
25-
- needs manual bootstrapping and update handling
2623
- Clean node_modules and build dirs: `npm run clean`
2724
- Clean build dirs: `npm run clean-dist`
28-
- Add new node_module to one package: `lerna add <npm-package-name> --scope=@ui-schema/demo [--dev] [--peer]`, without `--scope` in all packages
29-
- Do not change `package.json` of packages manually, and if Bootstrap [lerna](https://lerna.js.org/): `npm run bootstrap` (maybe delete `package-lock.json`), or simply open an issue
30-
- Add new package `lerna create <name>` and follow on screen, e.g.: `lerna create material-pickers` add package name `@ui-schema/material-pickerss`, creates folder `./packages/material-pickers`
31-
32-
> All-in-one clean & reinstall command - skip the first one if not installed completely:
33-
> `npm run clean && rm -rf node_modules && rm -f package-lock.json && npm i && npm run bootstrap && npm run bootstrap && npm run link`
34-
>
35-
> The two-times `bootstrap` fixes sometimes stale `packages` dependencies/lock-files, but sometimes a manual deletion of those also helps with `node_modules` resolving issues.
3625

3726
## Contributors
3827

3928
By committing your code/creating a pull request to this repository you agree to release the code under the [MIT License](LICENSE) attached to the repository and to adhere to the [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md).
4029

41-
Questions? Feel free to open discussions or join the [slack channel](https://join.slack.com/t/ui-schema/shared_invite/zt-smbsybk5-dFIRLEPCJerzDwtycaA71w)!
30+
Questions? Feel free to open discussions or join the [discord channel](https://discord.gg/MAjgpwnm36)!

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 bemit UG (haftungsbeschränkt)
3+
Copyright (c) 2025 bemit UG (haftungsbeschränkt)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,27 @@
44

55
<h1 align="center">UI Schema: MUI Color</h1>
66

7-
React color pickers as MUI widgets for [UI-Schema](https://github.com/ui-schema/ui-schema).
7+
React color pickers as [MUI](https://mui.com) widgets for [UI-Schema](https://github.com/ui-schema/ui-schema).
88

99
[![Github actions Build](https://github.com/ui-schema/react-color/actions/workflows/blank.yml/badge.svg)](https://github.com/ui-schema/react-color/actions)
10-
[![react compatibility](https://img.shields.io/badge/React-%3E%3D17-success?style=flat-square&logo=react)](https://reactjs.org/)
11-
[![MIT license](https://img.shields.io/npm/l/@ui-schema/ui-schema?style=flat-square)](https://github.com/ui-schema/ui-schema/blob/master/LICENSE)
10+
[![react compatibility](https://img.shields.io/badge/React-%3E%3D18-success?style=flat-square&logo=react)](https://reactjs.org/)
11+
[![MIT license](https://img.shields.io/npm/l/@ui-schema/ui-schema?style=flat-square)](https://github.com/ui-schema/react-color/blob/main/LICENSE)
1212
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
1313
![Typed](https://flat.badgen.net/badge/icon/Typed?icon=typescript&label&labelColor=blue&color=555555)
1414

15-
- [`react-color`](https://www.npmjs.com/package/react-color) widgets for [MUI](https://mui.com): `@ui-schema/material-color` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/material-color?style=flat-square)](https://www.npmjs.com/package/@ui-schema/material-color) [![Component Documentation](https://img.shields.io/badge/Docs-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](https://ui-schema.bemit.codes/docs/material-color/material-color)
16-
- 🚧 [`react-colorful`](https://www.npmjs.com/package/react-colorful) widgets for [MUI](https://mui.com): `@ui-schema/material-colorful` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/material-colorful?style=flat-square)](https://www.npmjs.com/package/@ui-schema/material-colorful) [![Component Documentation](https://img.shields.io/badge/Docs-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](https://ui-schema.bemit.codes/docs/material-colorful/material-colorful)
15+
- [`react-color`](https://www.npmjs.com/package/react-color) widgets: `@ui-schema/material-color` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/material-color?style=flat-square)](https://www.npmjs.com/package/@ui-schema/material-color) [![Component Documentation](https://img.shields.io/badge/Documentation-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](./docs/material-color/material-color.md)
16+
- [`react-colorful`](https://www.npmjs.com/package/react-colorful) widgets: `@ui-schema/material-colorful` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/material-colorful?style=flat-square)](https://www.npmjs.com/package/@ui-schema/material-colorful) [![Component Documentation](https://img.shields.io/badge/Documentation-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](./docs/material-colorful/material-colorful.md)
1717

18-
## Versions
19-
20-
This project adheres to [semver](https://semver.org/), until `1.0.0` and beginning with `0.1.0`: all `0.x.0` releases are like MAJOR releases and all `0.0.x` like MINOR or PATCH, modules below `0.1.0` should be considered experimental.
18+
[![Visit Core Project](https://img.shields.io/badge/Visit%20Core%20Project-white?labelColor=fff&color=107b8c&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNDYuMjkgMTQ0Ljg3Ij48ZGVmcz48c3R5bGU+LmE0M2YzMmM3LTZiOWUtNDZhZi05Y2RkLWUxNzc1YjJjNzZiMHtmaWxsOiMwMzM5NDQ7fS5lNDNmYmJjMS0xNWM1LTRhZmUtOTdkNS0yYTk3YzY3MGJmZTN7ZmlsbDojMDVhZWNhO308L3N0eWxlPjwvZGVmcz48dGl0bGU+VUktU2NoZW1hPC90aXRsZT48cGF0aCBjbGFzcz0iYTQzZjMyYzctNmI5ZS00NmFmLTljZGQtZTE3NzViMmM3NmIwIiBkPSJNNTMuMjgsM0MzNCwzLDMwLDIsMTguMTIsNS4yMmMtMTAsMi43Mi0xNiwxMi4zMS0xNiwyMi43NC0uMTMsMTctLjI5LDM0LC4wNiw1MC45My41OCwyOC43NSwyMS4zNiw1NS4zOCw1MC4wNyw2NC43OSwzOC42NCwxMi42Niw4MC4yLTguMjUsOTIuNjgtNDYuNjQuMTMtLjM5LjMxLTEuMzYuMzMtMS40Mi0xLjIyLjM4LTEuNCwxLjE2LTEuODMsMS45LTkuNjksMTctMjQuNDIsMjUuNjUtNDMuOTIsMjUuNzdhNDQuNDMsNDQuNDMsMCwwLDEtMjIuODQtNi42M2MtMTMtNy42Ni0yMS0xOC44NC0yMi45LTM0IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMS45MyAtMi41MSkiLz48cGF0aCBjbGFzcz0iZTQzZmJiYzEtMTVjNS00YWZlLTk3ZDUtMmE5N2M2NzBiZmUzIiBkPSJNMTI1LjgsMzUuNzhjLTctOC40MS0xMy4xOS0xNy40MS0yMC42MS0yNS40NS02LjEyLDUuMjItOC4zMSwxMi4xOC04LjM4LDE5Ljg2LS4xMywxNC42NC0uMjEsMjkuMjguMDYsNDMuOTIuMjEsMTEuMzItNi40MiwyMC4xOC0xNywyMi41NkM3MC42NCw5OC43NCw2MC43Niw5NS40Nyw1NSw4NC4zNWExMi4yMiwxMi4yMiwwLDAsMC0xLjI2LTEuNzJjMS45MiwxNS4xOSw5LjkxLDI2LjM3LDIyLjksMzRhNDQuNDMsNDQuNDMsMCwwLDAsMjIuODQsNi42M2MxOS41LS4xMiwzNC4yMy04LjczLDQzLjkyLTI1Ljc3LjQzLS43NC42MS0xLjUyLDEuODMtMS45QzE0OSw4NC44LDE0OC4yNCwzMi4xNSwxNDgsMjEiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xLjkzIC0yLjUxKSIvPjxwYXRoIGNsYXNzPSJhNDNmMzJjNy02YjllLTQ2YWYtOWNkZC1lMTc3NWIyYzc2YjAiIGQ9Ik0xNDgsMjFWMy4xN2MtMy0uMTctMjEuMzUtMS44NS0zMS41My44OWEzMS42NSwzMS42NSwwLDAsMC0xMS4yOCw2LjI3YzcuNDIsOCwxMy42NSwxNywyMC42MSwyNS40NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEuOTMgLTIuNTEpIi8+PC9zdmc+Cg==)](https://github.com/ui-schema/ui-schema)
2119

22-
**Get the latest version - or [help build it](CONTRIBUTING.md):**
20+
[![Get Help on Discord](https://img.shields.io/badge/Get%20Help%20on%20Discord-blue?labelColor=fff&logoColor=505050&color=7B16FF&style=for-the-badge&logo=discord)](https://discord.gg/MAjgpwnm36)
2321

24-
- [latest releases](https://github.com/ui-schema/react-color/releases) (GitHub release notes)
25-
- *UI-Schema project:*
26-
- [update and migration notes](https://ui-schema.bemit.codes/updates) (docs page)
27-
- [current roadmap](https://github.com/ui-schema/ui-schema/discussions/184) (GitHub discussion)
28-
- [core repository](https://github.com/ui-schema/ui-schema)
22+
## Versions
2923

30-
## Contributing
24+
This project adheres to [semver](https://semver.org/), until `1.0.0` and beginning with `0.1.0`: all `0.x.0` releases are like MAJOR releases and all `0.0.x` like MINOR or PATCH, modules below `0.1.0` should be considered experimental.
3125

32-
See [CONTRIBUTING.md](CONTRIBUTING.md).
26+
**Get the [latest version](https://github.com/ui-schema/react-color/releases) - or [help build it](CONTRIBUTING.md)!**
3327

3428
## License
3529

36-
This project is free software distributed under the **[MIT LICENSE](LICENSE)**.
37-
38-
© 2024 bemit UG (haftungsbeschränkt)
30+
Released under the [MIT License](https://github.com/ui-schema/react-color/blob/main/LICENSE).

babel.config.json

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"presets": [
3-
"@babel/preset-react",
3+
[
4+
"@babel/preset-react",
5+
{
6+
"runtime": "automatic"
7+
}
8+
],
49
"@babel/preset-typescript"
510
],
611
"plugins": [
@@ -19,14 +24,55 @@
1924
"cjs": {
2025
"presets": [
2126
"@babel/preset-env",
22-
"@babel/preset-react",
27+
[
28+
"@babel/preset-react",
29+
{
30+
"runtime": "automatic"
31+
}
32+
],
2333
"@babel/preset-typescript"
34+
],
35+
"plugins": [
36+
[
37+
"babel-plugin-replace-import-extension",
38+
{
39+
"extMapping": {
40+
".js": ".cjs"
41+
}
42+
}
43+
]
44+
]
45+
},
46+
"mjs": {
47+
"presets": [
48+
[
49+
"@babel/preset-react",
50+
{
51+
"runtime": "automatic"
52+
}
53+
],
54+
"@babel/preset-typescript"
55+
],
56+
"plugins": [
57+
[
58+
"babel-plugin-replace-import-extension",
59+
{
60+
"extMapping": {
61+
".js": ".mjs"
62+
}
63+
}
64+
]
2465
]
2566
},
2667
"test": {
2768
"presets": [
2869
"@babel/preset-env",
29-
"@babel/preset-react",
70+
[
71+
"@babel/preset-react",
72+
{
73+
"runtime": "automatic"
74+
}
75+
],
3076
"@babel/preset-typescript"
3177
]
3278
},
@@ -36,7 +82,7 @@
3682
"@babel/preset-env",
3783
{
3884
"targets": {
39-
"node": "18"
85+
"node": "20"
4086
},
4187
"modules": false
4288
}
@@ -45,7 +91,7 @@
4591
"@babel/preset-typescript",
4692
{
4793
"targets": {
48-
"node": "18"
94+
"node": "20"
4995
},
5096
"modules": false
5197
}

docs/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Documentation
2+
3+
- [material-color](./material-color/material-color.md)
4+
- [material-colorful](./material-colorful/material-colorful.md)

0 commit comments

Comments
 (0)