Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/semantic-release/cha…
Browse files Browse the repository at this point in the history
…ngelog-6.0.3
  • Loading branch information
AnnaHoege authored Sep 13, 2023
2 parents 1cbc4cb + 16cfab5 commit f43c7bc
Show file tree
Hide file tree
Showing 106 changed files with 1,528 additions and 1,005 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ updates:
versioning-strategy: increase
commit-message:
prefix: "chore: "
ignore:
- dependency-name: "@types/node"
update-types: ["version-update:semver-major"]

- package-ecosystem: "npm"
directory: "/packages/tokens"
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
on:
workflow_call:

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Enable auto-merge for Dependabot PRs
if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.dependabot.outputs.update-type == 'version-update:semver-minor'}}
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
run: |
gh pr review --approve "$PR_URL"
gh pr merge --auto --merge "$PR_URL"
5 changes: 5 additions & 0 deletions .github/workflows/on-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ jobs:
uses: ./.github/workflows/validations.yml
with:
node_version: 18

dependabot-automerge:
name: Dependabot Automerge
needs: [ install, validations ]
uses: ./.github/workflows/dependabot-auto-merge.yml
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ node_modules/

# VS-CODE
.vscode/*
!.vscode/settings.json
.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
Expand Down
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
## [1.6.1](https://github.com/otto-de/b2b-design-system/compare/v1.6.0...v1.6.1) (2023-08-22)


### Bug Fixes

* **Table:** table sorting arrows now display correctly again ([4074cca](https://github.com/otto-de/b2b-design-system/commit/4074cca4d2d16e3b7153edde89a924a33b588a5e))

# [1.6.0](https://github.com/otto-de/b2b-design-system/compare/v1.5.0...v1.6.0) (2023-08-22)


### Bug Fixes

* **Checkbox Group:** [B2BDS-205] group disabled state now reliable ([4a0dbcb](https://github.com/otto-de/b2b-design-system/commit/4a0dbcbf6d23b7a4c3bf64670b78d2493188d560))
* **Input Group:** individual elements now correctly disabled in rerenders ([453ca16](https://github.com/otto-de/b2b-design-system/commit/453ca163373c0f652ee4f59e3ebd28975ff97314))


### Features

* **Checkbox Group:** [B2BDS-205] individual checkboxes in a group can be disabled ([cecc895](https://github.com/otto-de/b2b-design-system/commit/cecc895a1132c906ff7cde04ae7d45418e7ca3c3))
* **Checkbox:** [B2BDS-166] indeterminate state for checkbox ([3f3b2ba](https://github.com/otto-de/b2b-design-system/commit/3f3b2bae7f1382911fdb6a194a145138d9524c5d))
* **Table:** [B2BDS-166] selectable rows ([f8248d9](https://github.com/otto-de/b2b-design-system/commit/f8248d9d61d0bbc865ee765a998f7ee78f939e88))

# [1.5.0](https://github.com/otto-de/b2b-design-system/compare/v1.4.0...v1.5.0) (2023-07-03)


Expand Down
104 changes: 58 additions & 46 deletions package-lock.json

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

6 changes: 6 additions & 0 deletions packages/core-components/.storybook/manager.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
import { addons } from '@storybook/addons';
import customTheme from './b2b-theme';
import favicon from './public/favicon.svg';

const link = document.createElement('link');
link.setAttribute('rel', 'shortcut icon');
link.setAttribute('href', favicon);
document.head.appendChild(link);

addons.setConfig({
theme: customTheme,
Expand Down
5 changes: 0 additions & 5 deletions packages/core-components/.storybook/preview-body.html

This file was deleted.

4 changes: 4 additions & 0 deletions packages/core-components/.storybook/public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions packages/core-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@otto-de/b2b-core-components",
"version": "1.5.0",
"version": "1.6.1",
"description": "Core components defined with Stencil",
"author": "Otto GmbH",
"license": "Apache-2.0",
Expand Down Expand Up @@ -40,15 +40,15 @@
"build:storybook": "npm run copy-md-files && build-storybook -o docs-build/design-system"
},
"dependencies": {
"@otto-de/b2b-tokens": "1.5.0",
"@otto-de/b2b-tokens": "1.6.1",
"@stencil-community/eslint-plugin": "^0.5.0",
"@stencil/core": "^4.0.3"
"@stencil/core": "^3.4.2"
},
"devDependencies": {
"@babel/core": "^7.21.3",
"@fullhuman/postcss-purgecss": "^5.0.0",
"@stencil/postcss": "^2.1.0",
"@stencil/react-output-target": "^0.4.0",
"@stencil/react-output-target": "^0.5.3",
"@stencil/sass": "^3.0.0",
"@storybook/addon-actions": "^6.5.16",
"@storybook/addon-docs": "^6.5.16",
Expand Down
Loading

0 comments on commit f43c7bc

Please sign in to comment.