Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:public-ui/kolibri into 7015-remo…
Browse files Browse the repository at this point in the history
…ve-deprecated

* 'develop' of github.com:public-ui/kolibri: (74 commits)
  review fixes
  chore: update deps and lock
  Update all snapshots$ $ Refs: #7032
  fixed typo
  Update CONTRIBUTING.md for new branches
  bem refactor
  Update all snapshots$ $ Refs: #7032
  Revert "Update all snapshots$"
  style: adjust input adornments and button properties for better layout
  Update all snapshots$ $ Refs: #7032
  Revert "Update all snapshots$"
  style: adjust gap for kol-input in input-range component
  Update all snapshots$ $ Refs: #7032
  Revert "Update all snapshots$"
  style: adjust gap in input styles and improve message handling in FormField component
  Update all snapshots$ $ Refs: #7032
  Revert "Update all snapshots$"
  style: remove unnecessary padding from input elements in input-core.scss
  style: restructure checkbox layout with label wrapper and adjust styles
  style: disable pointer events for checkbox icon
  ...
  • Loading branch information
sdvg committed Dec 17, 2024
2 parents 617f1d7 + fd4be81 commit c983f69
Show file tree
Hide file tree
Showing 210 changed files with 9,643 additions and 6,100 deletions.
38 changes: 19 additions & 19 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ We work according to the Git flow: https://medium.com/android-news/gitflow-with-
9. Build all packages within the mono repository `pnpm -r build`
10. Navigate to the desired package in our monorepo
11. When you want to start the project navigate to `packages/components/` and run `pnpm dev`
12. To watch for changes navigate to `samples/react/` and execute `pnpm start`. `http://localhost:8080/` will open automatically
12. To watch for changes navigate to `packages/samples/react/` and execute `pnpm start`. `http://localhost:8080/` will open automatically

### Develop new component

Expand All @@ -78,8 +78,8 @@ If it is also necessary to edit dependent packages such as `@public-ui/component

### Back porting to older Major-Versions

By default, development is carried out in the `development` branch for the following version. However, if it becomes necessary to provide an issue for an older major release, such as version 1.7.x, the code change must also be merged into the corresponding release branch. In this case, it would be the `release/1.7` branch. It is important that the branch that was created from the `develop` is not merged into the release branch, as otherwise the next patch version will receive all the changes from the current development status.
The simplest procedure is therefore to create a new branch from the release branch (e.g. `release/1.7`) and transfer the individual commits of the feature branch from the `develop` to the new branch using cherry-picking. This branch can then be merged into the release branch as normal with a new pull request.
By default, development is carried out in the `development` branch for the following version. However, if it becomes necessary to provide an issue for an older major release, such as version 1.x.x, the code change must also be merged into the corresponding release branch. In this case, it would be the `release/1` branch. It is important that the branch that was created from the `develop` is not merged into the release branch, as otherwise the next patch version will receive all the changes from the current development status.
The simplest procedure is therefore to create a new branch from the release branch (e.g. `release/1`) and transfer the individual commits of the feature branch from the `develop` to the new branch using cherry-picking. This branch can then be merged into the release branch as normal with a new pull request.

### Snapshot Testing for Visual Changes

Expand All @@ -94,24 +94,24 @@ The following methods can be used to update the snapshots.

1. **GitHub website:** Update the snapshots directly on the GitHub website by following these steps.

- Navigate to the `Actions` tab in the `kolibri` repository.
- Execute the `03 - Update Snapshots` action.
- Select the desired branch in which you want to update the snapshots.
- The workflow checks out the branch, updates all snapshot files, and commits the changes to that branch.
- Navigate to the `Actions` tab in the `kolibri` repository.
- Execute the `03 - Update Snapshots` action.
- Select the desired branch in which you want to update the snapshots.
- The workflow checks out the branch, updates all snapshot files, and commits the changes to that branch.

2. **Terminal Command:** Use the [GitHub CLI (gh)](https://cli.github.com/) to run the `update-snapshots.yml` action from the local terminal. This method is recommended for updating snapshots on the current branch without navigating to the GitHub website. For terminal convenience, the [GitHub CLI (gh)](https://cli.github.com/) needs to be installed.

- Run the following command within the project directory to update the snapshots in your checked-out branch:
```bash
gh workflow run update-snapshots.yml -r `git rev-parse --abbrev-ref HEAD`
```
- If your want to delete all snapshots before regenerating them add `-f purge_snapshots=true` to the command:
```bash
gh workflow run update-snapshots.yml -r `git rev-parse --abbrev-ref HEAD` -f purge_snapshots=true
```
- You can also run the action on a different branch by specifying the another target branch with the `-r <branch_name>` flag. For example, to update snapshots on the `main` branch:
```bash
gh workflow run update-snapshots.yml -r main
```
- Run the following command within the project directory to update the snapshots in your checked-out branch:
```bash
gh workflow run update-snapshots.yml -r `git rev-parse --abbrev-ref HEAD`
```
- If your want to delete all snapshots before regenerating them add `-f purge_snapshots=true` to the command:
```bash
gh workflow run update-snapshots.yml -r `git rev-parse --abbrev-ref HEAD` -f purge_snapshots=true
```
- You can also run the action on a different branch by specifying the another target branch with the `-r <branch_name>` flag. For example, to update snapshots on the `main` branch:
```bash
gh workflow run update-snapshots.yml -r main
```

These steps ensure that visual snapshots are updated systematically, maintaining the integrity of the testing process.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"devDependencies": {
"@commitlint/cli": "19.6.0",
"@commitlint/cli": "19.6.1",
"@commitlint/config-conventional": "19.6.0",
"cross-env": "7.0.3",
"husky": "9.1.7",
"js-yaml": "4.1.0",
"lerna": "8.1.9",
"license-report": "6.7.0",
"lint-staged": "15.2.10",
"license-report": "6.7.1",
"lint-staged": "15.2.11",
"npm-check-updates": "17.1.11",
"npm-run-all": "4.1.5",
"prettier": "3.3.3",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"ts-node": "10.9.2",
"ts-prune": "0.10.3",
"typescript": "5.6.3"
"typescript": "5.7.2"
},
"engines": {
"pnpm": "^9"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/angular/v15/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"prettier": "3.3.3",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"rxjs": "7.8.1",
"typescript": "4.9.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/angular/v16/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"prettier": "3.3.3",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"rxjs": "7.8.1",
"typescript": "5.1.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/angular/v17/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"prettier": "3.3.3",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"rxjs": "7.8.1",
"typescript": "5.4.5",
Expand Down
12 changes: 6 additions & 6 deletions packages/adapters/angular/v18/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@
"import": "./dist/index.js"
},
"devDependencies": {
"@angular/common": "18.2.12",
"@angular/compiler": "18.2.12",
"@angular/compiler-cli": "18.2.12",
"@angular/core": "18.2.12",
"@angular/common": "18.2.13",
"@angular/compiler": "18.2.13",
"@angular/compiler-cli": "18.2.13",
"@angular/core": "18.2.13",
"@public-ui/components": "workspace:*",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"prettier": "3.3.3",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"rxjs": "7.8.1",
"typescript": "5.5.4",
"zone.js": "0.14.10"
},
"peerDependencies": {
"@angular/core": "18.2.12",
"@angular/core": "18.2.13",
"@public-ui/components": "workspace:*"
},
"files": [
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/preact/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"@public-ui/components": "workspace:*",
"react": "18.3.1",
"react-dom": "18.3.1",
"typescript": "5.6.3",
"typescript": "5.7.2",
"unbuild": "1.2.1"
},
"peerDependencies": {
"preact": ">=10.24.3"
"preact": ">=10.25.2"
},
"sideEffects": false,
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/react-standalone/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@public-ui/react": "workspace:*",
"cpy-cli": "5.0.0",
"rimraf": "6.0.1",
"webpack": "5.96.1",
"webpack": "5.97.1",
"webpack-cli": "5.1.4"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"@types/react": "18.3.4",
"@types/react-dom": "18.3.1",
"@types/react-dom": "18.3.5",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.6.3",
"typescript": "5.7.2",
"unbuild": "1.2.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"solid-js": "1.9.3",
"typescript": "5.6.3",
"typescript": "5.7.2",
"unbuild": "1.2.1"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
"prepack": "unbuild"
},
"devDependencies": {
"@babel/types": "7.26.0",
"@babel/types": "7.26.3",
"@public-ui/components": "workspace:*",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.5",
"@types/normalize-package-data": "2.4.4",
"typescript": "5.6.3",
"typescript": "5.7.2",
"unbuild": "1.2.1",
"vue": "3.4.21"
},
Expand Down
18 changes: 9 additions & 9 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
},
"dependencies": {
"@floating-ui/dom": "1.6.12",
"adopted-style-sheets": "1.1.6",
"adopted-style-sheets": "1.1.7",
"clsx": "2.1.1",
"color-convert": "2.0.1",
"color-rgba": "2.4.0",
Expand All @@ -85,7 +85,7 @@
"wcag-contrast": "3.0.0"
},
"devDependencies": {
"@playwright/test": "1.49.0",
"@playwright/test": "1.49.1",
"@public-ui/stencil-angular-output-target": "0.9.0",
"@public-ui/stencil-react-output-target": "0.6.0",
"@public-ui/stencil-solid-output-target": "0.2.0",
Expand All @@ -110,25 +110,25 @@
"cssnano": "7.0.6",
"eslint": "8.57.1",
"eslint-plugin-html": "8.1.2",
"eslint-plugin-jsdoc": "50.5.0",
"eslint-plugin-jsdoc": "50.6.1",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.2",
"jest": "26.6.3",
"knip": "5.37.1",
"lighthouse": "12.2.2",
"knip": "5.40.0",
"lighthouse": "12.3.0",
"mustache": "4.2.0",
"postcss": "8.4.49",
"postcss-sorting": "9.1.0",
"prettier": "3.3.3",
"prettier": "3.4.2",
"pug": "3.0.3",
"rimraf": "6.0.1",
"stencil-awesome-test": "1.0.6",
"terser": "5.36.0",
"terser": "5.37.0",
"twig": "1.17.1",
"typescript": "5.6.3"
"typescript": "5.7.2"
},
"peerDependencies": {
"adopted-style-sheets": "1.1.6"
"adopted-style-sheets": "1.1.7"
},
"files": [
"assets",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
inset: auto;
position: absolute;
z-index: 1;
pointer-events: none;
}

&:not(.checked):not(.indeterminate) .icon::part(icon) {
Expand Down
Loading

0 comments on commit c983f69

Please sign in to comment.