Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:public-ui/kolibri into refactori…
Browse files Browse the repository at this point in the history
…ng/7178-convert-input-scss-to-bem

* 'develop' of github.com:public-ui/kolibri: (181 commits)
  Fix E2E test split button
  Fix handling of minus sign in number input
  Fix split-button test
  Update all snapshots$ $ Refs: #7036
  BEM Refactoring split-button
  chore: release 3.0.0-rc.2
  review changes
  removed media for -bottom
  test update
  refactor itz
  added pagination modifier
  Update all snapshots$ $ Refs: #7036
  update default theme
  test update
  review changes
  refactor bem for standart, ecl
  fixed sort
  fixed header align
  review changes
  Remove deprecated-annotations for ariaControls and ariaExpanded
  ...
  • Loading branch information
sdvg committed Jan 14, 2025
2 parents 461ada2 + 4f05a36 commit 9ba7f9b
Show file tree
Hide file tree
Showing 341 changed files with 5,734 additions and 7,357 deletions.
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/1.bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ body:
- 'Avatar'
- 'Badge'
- 'Breadcrumb'
- 'Button-Group'
- 'Button-Link'
- 'Button'
- 'Card'
Expand All @@ -89,7 +88,6 @@ body:
- 'Heading'
- 'Icon'
- 'Image'
- 'Indented-Text'
- 'Input-Checkbox'
- 'Input-Color'
- 'Input-Date'
Expand All @@ -101,7 +99,6 @@ body:
- 'Input-Range'
- 'Input-Text'
- 'Link-Button'
- 'Link-Group'
- 'Link'
- 'Modal'
- 'Nav'
Expand Down Expand Up @@ -171,4 +168,4 @@ body:
}
}
validations:
required: true
required: true
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.
45 changes: 44 additions & 1 deletion docs/BREAKING_CHANGES.v3.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,56 @@ New major versions of KoliBri are developed with the goal of simplifying mainten

For more information, see the [KoliBri Maintenance and Support Strategy](https://github.com/public-ui/kolibri/blob/develop/MIGRATION.md).

## Components
## Removed Components

The following components have been removed:

- kol-button-group
- kol-indented-text
- kol-link-group
- kol-logo
- kol-table

## Changed Components

### kol-abbr

- Visually, the tooltip has been replaced by a simple label shown in parentheses after the abbreviation.
- The property `_tooltipAlign` has been removed.

### kol-modal

- The property `_activeElement` has been removed. Use the methods `openModal` and `closeModal` instead.

### kol-table-stateful

- The table header property `sort` has been removed. Use `compareFn` instead.

### kol-input-file

- The property `_value` has been removed as it never served a purpose. Use the `getValue()` method instead to access the FileList.

### kol-table-stateful

- The DOM event `kol-selection-change` has been renamed to `kolSelectionChange`.

### kol-table-stateless

- The DOM event `kol-selection-change` has been renamed to `kolSelectionChange`.

## `focus`-methods

The public `focus`-methods have been removed from all components. Use `kolFocus` instead.

## All Input Components

- The property `_alert` has been removed. It's now being handled automatically based on `_msg` and the touched state. See #6138.
- The property `_error` has been removed. Use `_msg_` instead.

## Toaster

- The toast default `alertVariant` and options property `defaultAlertVariant` have been removed. Use `variant` and `defaultVariant` instead.

## Themes

### BMF-Theme (Bundesministerium der Finanzen)
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"packages/tools/visual-tests"
],
"useNx": true,
"version": "3.0.0-rc.1"
"version": "3.0.0-rc.2"
}
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
4 changes: 2 additions & 2 deletions packages/adapters/angular/v15/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v15",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
4 changes: 2 additions & 2 deletions packages/adapters/angular/v16/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v16",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
4 changes: 2 additions & 2 deletions packages/adapters/angular/v17/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v17",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
14 changes: 7 additions & 7 deletions packages/adapters/angular/v18/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v18",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
2 changes: 1 addition & 1 deletion packages/adapters/hydrate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/hydrate",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/preact/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/preact",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
4 changes: 2 additions & 2 deletions packages/adapters/react-standalone/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/react-standalone",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
6 changes: 3 additions & 3 deletions packages/adapters/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/react",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
4 changes: 2 additions & 2 deletions packages/adapters/solid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/solid",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
6 changes: 3 additions & 3 deletions packages/adapters/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/vue",
"version": "3.0.0-rc.1",
"version": "3.0.0-rc.2",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down 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
3 changes: 2 additions & 1 deletion packages/components/.eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
**/assets/**
src/**/*.js
src/**/*.html
src/**/*.html
scripts/vaadin.js
1 change: 1 addition & 0 deletions packages/components/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/dist/
/dist-e2e/
/doc/**
/loader/
/public/
Expand Down
Loading

0 comments on commit 9ba7f9b

Please sign in to comment.