Skip to content

Commit c9c2cab

Browse files
authored
Merge branch 'main' into refactor-updated-github-actions
2 parents 42d646b + 1a316bd commit c9c2cab

File tree

5 files changed

+61
-64
lines changed

5 files changed

+61
-64
lines changed

.github/actions/extract-branch/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
using: "composite"
1010
steps:
1111
- name: ⏬ Get branch name
12-
uses: actions/github-script@v6
12+
uses: actions/github-script@v7
1313
id: get-branch-name
1414
with:
1515
result-encoding: string

.github/actions/npm-cache/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
# https://github.com/actions/setup-node
99
uses: actions/setup-node@v4
1010
with:
11-
node-version: 22
11+
node-version-file: ".nvmrc"
1212

1313
- name: Display node and npm version
1414
shell: bash

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
[![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/xojs/xo)
1414
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
1515
[![@db-ui/core on Npmjs](https://img.shields.io/npm/v/@db-ui/core.svg?color=rgb%28237%2C%2028%2C%2036%29 "npm version")](https://npmjs.com/package/@db-ui/core "DB UI Core – on NPM")
16-
![Based on DB UX Design System guidelines](https://img.shields.io/badge/Based%20on-DB%20Design%20System%20UX%20Guides%20%2B%20Standards-d7dce1.svg)
16+
![Based on DB UX Design System version 2](https://img.shields.io/badge/Based%20on-DB%20Design%20System-d7dce1.svg)
1717
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
1818
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.0-4baaaa.svg)](CODE-OF-CONDUCT.md)
1919

2020
<!-- ![Pipeline status](https://github.com/db-ui/core/badges/main/pipeline.svg?style=flat) -->
2121

2222
> [!WARNING]
2323
> We've tried a [quick migration to newer SCSS syntax like e.g. `@use` instead of the nowadays deprecated `@import`](https://github.com/db-ui/core/issues/994), but this seems to be more complicated than expected.
24-
> You might face several warnings on the console when using SASS with our packages regarding `@import` usage. If you'd like to prevent those, you might as well want to evaluate migrating to our newer version of the DB UX Design System: <https://github.com/db-ui/mono>
24+
> You might face several warnings on the console when using SASS with our packages regarding `@import` usage. If you'd like to prevent those, you might as well want to evaluate migrating to our newer version of the DB UX Design System v2: <https://github.com/db-ui/mono>
2525
2626
DB Personenverkehr and DB Systel have merged their Design Systems for Web [with DB UX Design System v2](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components) as their successor. Our goal is to provide a common UX based on the [DB "Moderne Ikone"](https://marketingportal.extranet.deutschebahn.com/marketingportal/Marke-und-Design#) for customer and employee applications. To achieve an end 2 end consistence from conception to implementation, we bring you this new version of DB UI Core (npm: `@db-ui/core`), that is being used within a Design System by S.R (Reisendeninformation) as well.
2727

@@ -47,7 +47,7 @@ DB UI Core provides robust HTML UI components, reusable visual styles, and power
4747

4848
### Consistent & Compliant
4949

50-
DB UI Core is based on the [DB UX Design System](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components), that are the guidelines for any Personenverkehr Customer and Deutsche Bahn Enterprise website and web applications.
50+
DB UI Core is based on the [DB UX Design System v2](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components), that are the guidelines for any Personenverkehr Customer and Deutsche Bahn Enterprise website and web applications.
5151

5252
### Accessible
5353

@@ -63,13 +63,13 @@ DB UI Core is decoupled from the JavaScript layer, to implement the patterns in
6363

6464
### Evergreen
6565

66-
As [DB UX Design System](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components) evolves, so does DB UI Core, meaning apps only need to keep their DB UI Core package updated to ensure the latest look and feel.
66+
As [DB UX Design System v2](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components) evolves, so does DB UI Core, meaning apps only need to keep their DB UI Core package updated to ensure the latest look and feel.
6767

6868
## More information
6969

7070
Additionally we'll provide some more information over time regrading the whole ecosystem:
7171

72-
- [DB UX Design System documentation within the DB Marketingportal (german)](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components)
72+
- [DB UX Design System v2 documentation within the DB Marketingportal (german)](https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/version-2/Components)
7373
- [Confluence / Base Wiki - "Technische Umsetzung des Enterprise UI Design Systems" (german, only available internally)](https://db.de/pu8moh)
7474
- [Confluence - Web UI Component Library (only available internally)](https://db.de/1tyr73)
7575
- [Changelog](https://github.com/db-ui/core/blob/main/CHANGELOG.md)

package-lock.json

Lines changed: 50 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@
9090
"npm-run-all2": "7.0.2",
9191
"pa11y-ci": "^3.1.0",
9292
"plugin-node-patternlab-inline-remote-assets": "^0.2.1",
93-
"postcss": "^8.5.0",
93+
"postcss": "^8.5.1",
9494
"postcss-cli": "^11.0.0",
9595
"postcss-focus": "^7.0.0",
9696
"postcss-list-style-safari-fix": "^1.0.0",
9797
"prettier": "^3.4.2",
9898
"rimraf": "^6.0.1",
99-
"sass": "^1.83.3",
100-
"start-server-and-test": "^2.0.9",
99+
"sass": "^1.83.4",
100+
"start-server-and-test": "^2.0.10",
101101
"stylelint": "^14.16.1",
102102
"stylelint-config-prettier": "^9.0.5",
103103
"stylelint-config-sass-guidelines": "^9.0.1",
@@ -112,8 +112,5 @@
112112
"registry": "https://registry.npmjs.org/",
113113
"access": "public"
114114
},
115-
"homepage": "https://db-ui.github.io/core/",
116-
"overrides": {
117-
"cross-spawn": "~7.0.5"
118-
}
115+
"homepage": "https://db-ui.github.io/core/"
119116
}

0 commit comments

Comments
 (0)