Skip to content

Commit

Permalink
Merge branch 'main' into refactor/ds-1649-card-use-direction-extended
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelklibani authored Jan 28, 2025
2 parents 022e102 + 2b5daa9 commit 57301e1
Show file tree
Hide file tree
Showing 28 changed files with 2,319 additions and 3,701 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- name: Publish Web Package Code Coverage
# When Nx hits its cloud cache, there is no generated coverage to sent, e.g. do not let this crash
if: ${{ hashFiles('./packages/web/.coverage/lcov.info') != '' }}
uses: coverallsapp/github-action@v2.3.4
uses: coverallsapp/github-action@v2.3.6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: ./packages/web/.coverage/lcov.info
Expand All @@ -99,7 +99,7 @@ jobs:
- name: Publish Web-React Package Code Coverage
# When Nx hits its cloud cache, there is no generated coverage to sent, e.g. do not let this crash
if: ${{ hashFiles('./packages/web-react/.coverage/lcov.info') != '' }}
uses: coverallsapp/github-action@v2.3.4
uses: coverallsapp/github-action@v2.3.6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: ./packages/web-react/.coverage/lcov.info
Expand All @@ -109,7 +109,7 @@ jobs:
- name: Publish Analytics Package Code Coverage
# When Nx hits its cloud cache, there is no generated coverage to sent, e.g. do not let this crash
if: ${{ hashFiles('./packages/analytics/.coverage/lcov.info') != '' }}
uses: coverallsapp/github-action@v2.3.4
uses: coverallsapp/github-action@v2.3.6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: ./packages/analytics/.coverage/lcov.info
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.5
18.20.6
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,38 @@ See individual [packages](#packages) to learn how to get started.
### Prerequisites

- [NodeJS][nodejs]
- [Corepack][corepack]
- [Yarn][yarn]
- [Lerna][lerna]

### Start Development
### 🚀 Start Development

- `git clone ssh://git@github.com:lmc-eu/spirit-design-system.git`
- `cd spirit-design-system`
- `corepack enable`
- `corepack install`
- `yarn install`
- `yarn start`

See [`package.json`][package.json] for all available tasks.

## License
## 🙌 Contributing

We're always looking for contributors to help us fix bugs, build new features,
or help us improve the project documentation. If you're interested, definitely
check out our [Contributing Guide][contributing]! 👀

## 📝 License

See the [LICENSE][license] file for information.

[alma-career]: https://github.com/lmc-eu
[code-quality-checks]: https://github.com/lmc-eu/spirit-design-system/actions
[code-quality-checks-svg]: https://github.com/lmc-eu/spirit-design-system/actions/workflows/test.yaml/badge.svg?branch=main
[contributing]: https://github.com/lmc-eu/spirit-design-system/blob/main/CONTRIBUTING.md
[coverage-status]: https://coveralls.io/github/lmc-eu/spirit-design-system?branch=main
[coverage-status-svg]: https://coveralls.io/repos/github/lmc-eu/spirit-design-system/badge.svg?branch=main
[corepack]: https://yarnpkg.com/corepack#installation
[lerna]: https://lerna.js.org
[lerna-svg]: https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg
[license]: https://github.com/lmc-eu/spirit-design-system/blob/main/LICENSE.md
Expand Down
4 changes: 2 additions & 2 deletions apps/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"autoprefixer": "10.4.20",
"clean-css-cli": "5.6.3",
"npm-run-all2": "6.2.6",
"postcss": "8.4.49",
"postcss": "8.5.1",
"rollup": "4.27.3",
"sass-embedded": "1.83.1",
"sass-embedded": "1.83.4",
"sass-true": "8.1.0",
"shx": "0.3.4",
"typescript": "5.6.3",
Expand Down
20 changes: 10 additions & 10 deletions apps/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
},
"devDependencies": {
"@babel/core": "7.26.7",
"@storybook/addon-actions": "8.4.7",
"@storybook/addon-essentials": "8.4.7",
"@storybook/addon-links": "8.4.7",
"@storybook/blocks": "8.4.7",
"@storybook/html": "8.4.7",
"@storybook/react": "8.4.7",
"@storybook/react-vite": "8.4.7",
"@storybook/test": "8.4.7",
"@storybook/theming": "8.4.7",
"@storybook/addon-actions": "8.5.2",
"@storybook/addon-essentials": "8.5.2",
"@storybook/addon-links": "8.5.2",
"@storybook/blocks": "8.5.2",
"@storybook/html": "8.5.2",
"@storybook/react": "8.5.2",
"@storybook/react-vite": "8.5.2",
"@storybook/test": "8.5.2",
"@storybook/theming": "8.5.2",
"@vitejs/plugin-react": "4.3.4",
"react": "18.3.1",
"react-dom": "18.3.1",
"storybook": "8.4.7",
"storybook": "8.5.2",
"typescript": "5.6.3",
"vite": "5.4.11"
}
Expand Down
26 changes: 13 additions & 13 deletions apps/web-twig-demo/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"php": "^8.3",
"ext-ctype": "*",
"ext-iconv": "*",
"lmc/spirit-web-twig-bundle": "^3.0",
"symfony/asset": "5.4.*",
"symfony/console": "5.4.*",
"symfony/dotenv": "^5.4",
"lmc/spirit-web-twig-bundle": "^4.0",
"symfony/asset": "^6.4",
"symfony/console": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/flex": "^1",
"symfony/framework-bundle": "^5.4",
"symfony/runtime": "^5.4",
"symfony/twig-bundle": "5.4.*",
"symfony/webpack-encore-bundle": "^1.16",
"symfony/yaml": "^5.4"
"symfony/framework-bundle": "^6.4",
"symfony/runtime": "^6.4",
"symfony/twig-bundle": "^6.4",
"symfony/webpack-encore-bundle": "^2.2",
"symfony/yaml": "^6.4"
},
"config": {
"allow-plugins": {
Expand Down Expand Up @@ -62,12 +62,12 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.4.*"
"require": "6.4.*"
}
},
"require-dev": {
"symfony/debug-bundle": "5.4.*",
"symfony/stopwatch": "5.4.*",
"symfony/web-profiler-bundle": "5.4.*"
"symfony/debug-bundle": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
}
}
Loading

0 comments on commit 57301e1

Please sign in to comment.