Skip to content

Commit 9e7a32e

Browse files
michaelmkrausmichaelmkraus
committed
chore: merge main to resolve conflicts
2 parents ba5636d + 1258842 commit 9e7a32e

File tree

94 files changed

+3382
-1416
lines changed

Some content is hidden

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

94 files changed

+3382
-1416
lines changed

‎.changeset/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ We handle pre-releases without changesets.
110110
Instead, create a new [GitHub release](https://github.com/db-ux-design-system/core-web/releases/new)
111111
with a tag like `1.2.3-next0` and the CI will pick it up and publish it to npm with the tag `next`.
112112

113-
114113
---
115114

116-
117115
## 🔑 Cheatsheet
118116

119117
```bash

‎.config/.lintstagedrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ export default {
1515
'**/package.json': [
1616
() => 'npm install --package-lock-only --ignore-scripts',
1717
'npx npm-package-json-lint'
18-
],
18+
]
1919
};

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. -->
44

5+
resolves # (issue number)
6+
57
## Types of changes
68

79
<!-- What types of changes does your code introduce?

‎.github/actions/auto-commit/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ runs:
6666
BASE_BRANCH: ${{ github.head_ref }}
6767
run: |
6868
PR_BODY="This PR was created automatically by a GitHub Action.
69-
69+
7070
Target PR (this PR will be merged into): <https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}>"
71-
71+
7272
# Create the PR and capture its URL
7373
gh pr create --base "$BASE_BRANCH" --head "$NEW_PR_BRANCH" --title "Automated PR: $COMMIT_MESSAGE" --body "$PR_BODY"
7474

‎.github/dependabot.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,14 @@ updates:
9393
vite:
9494
patterns:
9595
- "vite*"
96-
- "vitest*"
96+
update-types:
97+
- "minor"
98+
- "major"
99+
# Test tools
100+
vitest:
101+
patterns:
102+
- "vitest"
103+
- "@vitest*"
97104
update-types:
98105
- "minor"
99106
- "major"
@@ -120,6 +127,13 @@ updates:
120127
update-types:
121128
- "minor"
122129
- "major"
130+
storybook:
131+
patterns:
132+
- "storybook"
133+
- "@storybook*"
134+
update-types:
135+
- "minor"
136+
- "major"
123137
inquirer:
124138
patterns:
125139
- "@inquirer/*"

‎.github/workflows/01-build-outputs.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,37 @@ jobs:
1919
uses: ./.github/actions/npm-cache
2020

2121
- name: ⏬ Download foundations build
22-
uses: actions/download-artifact@v5
22+
uses: actions/download-artifact@v6
2323
with:
2424
name: db-ux-foundations-build
2525
path: packages/foundations/build
2626

2727
- name: ⏬ Download components build
28-
uses: actions/download-artifact@v5
28+
uses: actions/download-artifact@v6
2929
with:
3030
name: db-ux-components-build
3131
path: packages/components/build
3232

3333
- name: ⏬ Download migration build
34-
uses: actions/download-artifact@v5
34+
uses: actions/download-artifact@v6
3535
with:
3636
name: db-ux-migration-build
3737
path: packages/migration/build
3838

3939
- name: ⏬ Download stylelint build
40-
uses: actions/download-artifact@v5
40+
uses: actions/download-artifact@v6
4141
with:
4242
name: db-ux-stylelint-build
4343
path: packages/stylelint/build
4444

4545
- name: ⏬ Download agent-cli build
46-
uses: actions/download-artifact@v5
46+
uses: actions/download-artifact@v6
4747
with:
4848
name: db-ux-agent-cli-build
4949
path: packages/agent-cli/build
5050

5151
- name: ⏬ Download output
52-
uses: actions/download-artifact@v5
52+
uses: actions/download-artifact@v6
5353
with:
5454
name: db-ux-output
5555
path: output
@@ -65,7 +65,7 @@ jobs:
6565
npm run lint-docs-file-references
6666
6767
- name: ⏫ Upload outputs
68-
uses: actions/upload-artifact@v4
68+
uses: actions/upload-artifact@v5
6969
with:
7070
name: db-ux-outputs
7171
path: build-outputs

‎.github/workflows/01-build-packages.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,37 +22,37 @@ jobs:
2222
run: npm run build
2323

2424
- name: ⏫ Upload foundations build
25-
uses: actions/upload-artifact@v4
25+
uses: actions/upload-artifact@v5
2626
with:
2727
name: db-ux-foundations-build
2828
path: packages/foundations/build
2929

3030
- name: ⏫ Upload output
31-
uses: actions/upload-artifact@v4
31+
uses: actions/upload-artifact@v5
3232
with:
3333
name: db-ux-output
3434
path: output
3535

3636
- name: ⏫ Upload components build
37-
uses: actions/upload-artifact@v4
37+
uses: actions/upload-artifact@v5
3838
with:
3939
name: db-ux-components-build
4040
path: packages/components/build
4141

4242
- name: ⏫ Upload migration build
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v5
4444
with:
4545
name: db-ux-migration-build
4646
path: packages/migration/build
4747

4848
- name: ⏫ Upload stylelint build
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v5
5050
with:
5151
name: db-ux-stylelint-build
5252
path: packages/stylelint/build
5353

5454
- name: ⏫ Upload agent-cli build
55-
uses: actions/upload-artifact@v4
55+
uses: actions/upload-artifact@v5
5656
with:
5757
name: db-ux-agent-cli-build
5858
path: packages/agent-cli/build

‎.github/workflows/01-build-patternhub.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ jobs:
2323
uses: ./.github/actions/npm-cache
2424

2525
- name: ⏬ Download foundations build
26-
uses: actions/download-artifact@v5
26+
uses: actions/download-artifact@v6
2727
with:
2828
name: db-ux-foundations-build
2929
path: packages/foundations/build
3030

3131
- name: ⏬ Download output
32-
uses: actions/download-artifact@v5
32+
uses: actions/download-artifact@v6
3333
with:
3434
name: db-ux-output
3535
path: output
3636

3737
- name: ⏬ Download components build
38-
uses: actions/download-artifact@v5
38+
uses: actions/download-artifact@v6
3939
with:
4040
name: db-ux-components-build
4141
path: packages/components/build
@@ -54,7 +54,7 @@ jobs:
5454
echo "path=${NEXT_PUBLIC_BASE_PATH}" >> $GITHUB_OUTPUT
5555
5656
- name: ⏫ Upload Patternhub
57-
uses: actions/upload-artifact@v4
57+
uses: actions/upload-artifact@v5
5858
with:
5959
name: db-ux-patternhub
6060
path: build-showcases/patternhub

‎.github/workflows/01-build-showcases.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ jobs:
2323
uses: ./.github/actions/npm-cache
2424

2525
- name: ⏬ Download foundations build
26-
uses: actions/download-artifact@v5
26+
uses: actions/download-artifact@v6
2727
with:
2828
name: db-ux-foundations-build
2929
path: packages/foundations/build
3030

3131
- name: ⏬ Download output
32-
uses: actions/download-artifact@v5
32+
uses: actions/download-artifact@v6
3333
with:
3434
name: db-ux-output
3535
path: output
3636

3737
- name: ⏬ Download components build
38-
uses: actions/download-artifact@v5
38+
uses: actions/download-artifact@v6
3939
with:
4040
name: db-ux-components-build
4141
path: packages/components/build
@@ -50,7 +50,7 @@ jobs:
5050
npm run build --workspace=${{ inputs.showcase }}
5151
5252
- name: ⏫ Upload ${{ inputs.showcase }}
53-
uses: actions/upload-artifact@v4
53+
uses: actions/upload-artifact@v5
5454
with:
5555
name: db-ux-${{ inputs.showcase }}
5656
path: build-showcases/${{ inputs.showcase }}

‎.github/workflows/01-build-storybooks.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ jobs:
2626
uses: ./.github/actions/npm-cache
2727

2828
- name: ⏬ Download foundations build
29-
uses: actions/download-artifact@v5
29+
uses: actions/download-artifact@v6
3030
with:
3131
name: db-ux-foundations-build
3232
path: packages/foundations/build
3333

3434
- name: ⏬ Download output
35-
uses: actions/download-artifact@v5
35+
uses: actions/download-artifact@v6
3636
with:
3737
name: db-ux-output
3838
path: output
3939

4040
- name: ⏬ Download components build
41-
uses: actions/download-artifact@v5
41+
uses: actions/download-artifact@v6
4242
with:
4343
name: db-ux-components-build
4444
path: packages/components/build
@@ -49,7 +49,7 @@ jobs:
4949
run: npm run build --workspace=${{ inputs.storybook }}
5050

5151
- name: ⏫ Upload ${{ inputs.storybook }}
52-
uses: actions/upload-artifact@v4
52+
uses: actions/upload-artifact@v5
5353
with:
5454
name: db-ux-${{ inputs.storybook }}
5555
path: build-storybooks/${{ inputs.storybook }}

0 commit comments

Comments
 (0)