Skip to content

Commit 40851d4

Browse files
authored
Merge branch 'beta' into renovate/prettier-3.x-lockfile
2 parents 00f2e1d + 89dd1d6 commit 40851d4

File tree

5 files changed

+35
-16
lines changed

5 files changed

+35
-16
lines changed

.eslintrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ module.exports = {
1212
parserOptions: {
1313
ecmaVersion: "latest",
1414
},
15+
ignorePatterns: ["/storybook-static", "/dist"], // Ignoriere die Ordner foo und bar
1516
};

.github/workflows/build.yaml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,37 @@
11
name: build and deploy
22

3+
env:
4+
NODE_VERSION: "20"
5+
36
on: [push]
47

58
jobs:
9+
lint:
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: actions/setup-node@v4
16+
with:
17+
node-version: ${{ env.NODE_VERSION }}
18+
cache: "npm"
19+
- name: Install dependencies
20+
run: npm ci
21+
- name: Run formater and linter
22+
run: npm run lint
23+
624
build:
725
runs-on: ubuntu-latest
26+
needs: lint
827
permissions:
9-
contents: read # to be able to publish a GitHub release
28+
contents: read
1029
steps:
1130
- uses: actions/checkout@v4
1231
- uses: actions/setup-node@v4
1332
with:
14-
node-version: "20"
33+
node-version: ${{ env.NODE_VERSION }}
1534
cache: "npm"
16-
registry-url: "https://registry.npmjs.org"
1735
- run: npm ci # install dependencies
1836
- run: npm run build # build library
1937
- run: npm run build-storybook # build docs
@@ -41,9 +59,8 @@ jobs:
4159
- uses: actions/checkout@v4
4260
- uses: actions/setup-node@v4
4361
with:
44-
node-version: "20"
62+
node-version: ${{ env.NODE_VERSION }}
4563
cache: "npm"
46-
registry-url: "https://registry.npmjs.org"
4764
- run: npm ci # install dependencies
4865
- name: Download build-results
4966
uses: actions/download-artifact@v4

package-lock.json

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

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,11 @@
3333
"dist"
3434
],
3535
"scripts": {
36-
"build": "rimraf dist && npm run type-check && npm run build-only",
36+
"build": "rimraf dist && npm run build-only",
3737
"test:unit": "vitest",
3838
"build-only": "vite build",
39-
"type-check": "vue-tsc --build --force",
40-
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
41-
"format": "prettier --write ./",
39+
"lint": "prettier . --check && eslint . --ignore-path .gitignore && vue-tsc -p tsconfig.json --emitDeclarationOnly --skipLibCheck --composite false",
40+
"fix": "prettier . --write && eslint . --fix --ignore-path .gitignore",
4241
"semantic-release": "semantic-release",
4342
"storybook": "storybook dev -p 6006",
4443
"build-storybook": "storybook build"

src/components/Button/MucButton.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ const buttonVariantClass = computed(() => {
7979
}
8080
});
8181
82-
const iconAnimatedClass = computed(() => props.iconAnimated ? 'm-button--animated-right' : '');
82+
const iconAnimatedClass = computed(() =>
83+
props.iconAnimated ? "m-button--animated-right" : ""
84+
);
8385
8486
const handleClick = () => {
8587
emit("click");

0 commit comments

Comments
 (0)