Skip to content

Commit

Permalink
Merge branch 'main' into feat-Generating-provenance-statements
Browse files Browse the repository at this point in the history
  • Loading branch information
nmerget authored Oct 1, 2024
2 parents 7c63315 + 898e54c commit 534af69
Show file tree
Hide file tree
Showing 2,627 changed files with 6,604 additions and 4,046 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ updates:
update-types: ["version-update:semver-minor"]
# There is an issue with sass:1.77.5 and additional colors in foundations we ignore updates for now
- dependency-name: "sass"
# We currently need to ignore eslint@v9
- dependency-name: "eslint"
update-types: ["version-update:semver-minor"]
pull-request-branch-name:
separator: "-"
# https://github.com/dependabot/dependabot-core/issues/5226#issuecomment-1179434437
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
uses: ./.github/workflows/01-lint.yml
needs: [init]

test:
uses: ./.github/workflows/01-test.yml
needs: [init]

build-packages:
uses: ./.github/workflows/01-build-packages.yml
needs: [init]
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ jobs:
uses: ./.github/workflows/01-lint.yml
needs: [init]

test:
uses: ./.github/workflows/01-test.yml
needs: [init]

build-packages:
uses: ./.github/workflows/01-build-packages.yml
needs: [init]
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,8 @@ showcases/patternhub/public/iframe-resizer/*
/packages/foundations/assets/icons/functional/fonts/**/font-face.css
/packages/foundations/assets/icons/functional/fonts/**/info.json
/packages/foundations/scss/_normalize.scss

/packages/foundations/assets/icons/functional/fonts/**/*.eot
/packages/foundations/assets/icons/functional/fonts/**/*.svg
/packages/foundations/assets/icons/functional/fonts/**/*.ttf
/packages/foundations/assets/icons/functional/fonts/**/*.woff
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.
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.
2 changes: 1 addition & 1 deletion docs/migration/v0.2.x-to-v0.3.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ We refactored our colors which might add some breaking changes to current projec
We provide a cli tool to auto migrate your source code. Use this command in your repository:

```shell
npx @db-ui/foundations migration --src=./src
npx @db-ui/foundations@v0.3 migration --src=./src
```
36 changes: 36 additions & 0 deletions docs/migration/v0.3.x-to-v0.4.x.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
## Migration Beta (0.3.x) ➡ Beta (0.4.x)

### Icons

We refactored our icons which might add some breaking changes to current projects: <https://marketingportal.extranet.deutschebahn.com/marketingportal/Design-Anwendungen/db-ux-design-system/support/migration-guides/v0-3-0>

#### Migration table

| old | new |
| ------------------- | ------------------------- |
| swap_vertical | arrows_vertical |
| swap_horizontal | arrows_horizontal |
| reload | circular_arrows |
| volume_off | volume_silent |
| law | paragraph_mark |
| user | person |
| users | persons |
| wc_men | toilet_men |
| wc_women | toilet_women |
| wc | toilets |
| filter | sliders_horizontal |
| warning_triangle | exclamation_mark_triangle |
| visible | eye |
| visibility_disabled | eye_disabled |
| flip_horizontal | arrows_horizontal |
| flip_vertical | arrows_vertical |

## Automate migration via CLI

We provide a cli tool to auto migrate your source code. Use this command in your repository:

```shell
npx @db-ui/[email protected] migration --type=icon --src=./src
```

Please check the changes made in your codebase afterwards, as this is mainly a simple search & replace and there might be unexpected changes of similar wordings to our icon names for any other methods, or further code occurrences that don't even refer to icons.
2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"test:vue-showcase": "npm run test:e2e --workspace=vue-showcase"
},
"devDependencies": {
"@playwright/test": "1.47.0",
"@playwright/test": "1.47.2",
"cpr": "3.0.1",
"cross-env": "^7.0.3",
"dotenv": "^16.0.3",
Expand Down
2 changes: 1 addition & 1 deletion output/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"start": "ng serve"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.9",
"@angular-devkit/build-angular": "17.3.10",
"@angular/common": "17.3.12",
"ng-packagr": "17.3.0",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion output/react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import "@db-ui/components/build/styles/db-ui-42-rollup.css";
```tsx
import { DBButton } from '@db-ui/react-components';
...
<DBButton icon="user" onClick={()=>{console.log("Test")}}>Test</DBButton>
<DBButton icon="person" onClick={()=>{console.log("Test")}}>Test</DBButton>
...
```

Expand Down
4 changes: 2 additions & 2 deletions output/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"tsc": "tsc -p . --sourceMap false"
},
"devDependencies": {
"@playwright/experimental-ct-react": "1.47.0",
"@types/react": "^18.3.6",
"@playwright/experimental-ct-react": "1.47.2",
"@types/react": "^18.3.10",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion output/vue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import { DBButton } from "@db-ui/v-components";
</script>
<template>
<DBButton icon="user">Test</DBButton>
<DBButton icon="person">Test</DBButton>
</template>
```

Expand Down
10 changes: 5 additions & 5 deletions output/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
"test:components": "playwright test -c playwright.config.ts"
},
"dependencies": {
"vue": "^3.5.5"
"vue": "^3.5.10"
},
"devDependencies": {
"@playwright/experimental-ct-vue": "1.47.0",
"@vitejs/plugin-vue": "^5.1.3",
"replace-in-file": "^8.1.0",
"@playwright/experimental-ct-vue": "1.47.2",
"@vitejs/plugin-vue": "^5.1.4",
"replace-in-file": "^8.2.0",
"tsx": "^4.19.1",
"typescript": "^5.4.5",
"vite": "^5.4.4",
"vite": "^5.4.8",
"vue-tsc": "^2.1.6"
},
"publishConfig": {
Expand Down
21 changes: 12 additions & 9 deletions output/vue/scripts/fix-any-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,18 @@ const replaceAnyTypes = (input: string, component: string) => {
const propLines = roLine.match(/(.*);/g);
if (propLines) {
propLines.forEach((propLine) => {
const prop = propLine
.replace('?: any;', '')
.replace(': any;', '')
.trim();
// @ts-ignore
fileContent = fileContent.replaceAll(
propLine,
propLine.replace('any', `${propModel}["${prop}"]`)
);
// Check if prop(contains ": any") or function
if (propLine.includes(': any;')) {
const prop = propLine
.replace('?: any;', '')
.replace(': any;', '')
.trim();
// @ts-ignore
fileContent = fileContent.replaceAll(
propLine,
propLine.replace('any', `${propModel}["${prop}"]`)
);
}
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion output/webcomponent/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ A web-component library containing all components of [DB UX Design System (techn
import "node_modules/@db-ui/web-components/components/button/button.js";

...
<db-button variant="brand" icon="user">Test</db-button>
<db-button variant="brand" icon="person">Test</db-button>
...

```
Expand Down
Loading

0 comments on commit 534af69

Please sign in to comment.